Changeset 1124 for specdomain/trunk/src/specdomain/sphinxcontrib/specmacrofileparser.py

Timestamp:

Oct 1, 2012 1:08:46 PM (10 years ago)

Author:

jemian

Message:

fixes #35 and #36

File:

• specdomain/trunk/src/specdomain/sphinxcontrib/specmacrofileparser.py (modified) (5 diffs)

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

@@ -37 +37 @@
 extended_comment_marker     = r'\"{3}'
 extended_comment_match      = r'(' + extended_comment_marker + r')'
-macro_name                  = r'[a-zA-Z_][\w_]*'
+macro_name                  = r'\w+'
 macro_name_match            = r'(' + macro_name + r')'
 arglist_match               = r'(' + match_all + r')'
@@ -94 +94 @@
                         + arg_list_match                    # 3: optional arguments
                         + non_greedy_whitespace
-                        + '\''                              # start body section
+                        + r"[\\']+"                          # start body section
                         + non_greedy_filler_match           # 4: body
-                        + '\''                              # end body section
+                        + r"[\\']+"                          # end body section
                         + non_greedy_whitespace
                         + r'(#.*?)?'                        # 5: optional comment
@@ -201 +201 @@
             'local': self.handle_other,
             'rdef': self.handle_other,
+            'function rdef': self.handle_def,
         }
         process_first_list = ('descriptive comment', )
@@ -222 +223 @@
             for item in db[linenumber]:
                 if item['objtype'] not in process_first_list:
+                    if 'function rdef' == item['objtype']:
+                        pass
                     handler_method[item['objtype']](item, db)
             
@@ -423 +426 @@
                     if m is not None:
                         objtype = 'function ' + objtype
+                        if 'function rdef' == objtype:
+                            pass  # TODO: Should we do something special here?
                         args = m.group(1)
             d = {