Changeset 982

Timestamp:

Jun 27, 2012 2:33:01 PM (11 years ago)

Author:

jemian

Message:

also match cdef() embedded within an if(){} block, as in standard.mac

Location:

specdomain/trunk/src/specdomain

Files:

• macros/cdef-examples.mac (modified) (1 diff)
• sphinxcontrib/specmacrofileparser.py (modified) (1 diff)
• test/tester4.py (modified) (3 diffs)

specdomain/trunk/src/specdomain/macros/cdef-examples.mac

@@ -45 +45 @@
 cdef("user_waitmove","\nwait(1);\n","waitmove_hack","0x20")
 
+# it's possible to embed cdef in a block like this, like in standard.mac
+if DECISION==1{cdef("user_offsim", "getE;", "embedded")}
+
 """ end of  $Id$ """

specdomain/trunk/src/specdomain/sphinxcontrib/specmacrofileparser.py

@@ -193 +193 @@
         self.findings.append(dict(m))
         return True
+
     extended_comment_start_sig_re = re.compile(string_start
                                                 + non_greedy_whitespace

specdomain/trunk/src/specdomain/test/tester4.py

@@ -12 +12 @@
 import os
 
+# TODO: consider multiline declaration signtures
+# This test module only considers single line declarations
 
 spec_macro_declaration_match_re = re.compile(
@@ -23 +25 @@
                             + r'$'                      # line end
                         )
+
 spec_cdef_declaration_match_re = re.compile(
                               r'^'                      # line start
-                            + r'\s*?'                   # optional blank space
+                            + r'.*?'                    # optional any kind of preceding stuff, was \s*? (optional blank space)
                             + r'(cdef)'                 # 0: cdef
                             + r'\('                     # opening parenthesis
                             + r'(.*?)'                  # 1: args (anything between the parentheses)
                             + r'\)'                     # closing parenthesis
-                            + r'\s*?'                   # optional blank space
+                            + r'.*?'                    # optional blank space
                             + r'(#.*?)?'                # 2: optional comment
                             + r'$'                      # line end
@@ -59 +62 @@
 }
 
+for name, test in tests.items():
+    print "%10s  %s" % (name, test.pattern)
+
 for f in sorted(os.listdir(TEST_DIR)):
     if f.endswith('.mac'):