From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 20 Jan 2009 13:40:05 +0000 (+0000)
Subject: Match the ///< comments only with the third regexp
X-Git-Tag: 2.1.0~495
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=898f487776366dc434242110cfeebe160eb3e05b;p=bertos.git

Match the ///< comments only with the third regexp

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2187 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index a50df0f4..dfcaf68f 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -96,10 +96,10 @@ def getInfos(definition):
 
 def getDefinitionBlocks(text):
     block = []
-    block_tmp = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/\s*#define\s+(.*?)\s*?$", text, re.MULTILINE)
+    block_tmp = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/\s*#define\s+([^/]*?/[^/]*?)\s*?(?!/{3}<.*?)$", text, re.MULTILINE)
     for comment, define in block_tmp:
         block.append((" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?$", comment, re.MULTILINE)), define))
-    block += re.findall(r"/{3}<?\s*(.*)\s*#define\s+(.*)\s*?$", text, re.MULTILINE)
+    block += re.findall(r"/{3}<?\s*(.*)\s*#define\s+([^/]*?/[^/]*?)\s*?$", text, re.MULTILINE)
     block += [(comment, define) for define, comment in re.findall(r"#define\s*(.*?)\s*/{3}<\s*(.*?)\s*?$", text, re.MULTILINE)]
     return block