Changeset 920

Timestamp:

Jun 13, 2012 12:09:08 AM (11 years ago)

Author:

jemian

Message:

still don't quite understand how this works

Location:

specdomain/src/specdomain/sphinxcontrib

Files:

• specdomain.py (modified) (5 diffs)
• tester.py (added)

specdomain/src/specdomain/sphinxcontrib/specdomain.py

@@ -13 +13 @@
 
 import re
-import string
+import string                                       #@UnusedImport
 
 from docutils import nodes
@@ -35 +35 @@
 
 # REs for SPEC signatures
+#spec_func_sig_re = re.compile(
+#    r'''^ ([\w.]*:)?             # module name
+#          (\w+)  \s*             # thing name
+#          (?: \((.*)\)           # optional: arguments
+#           (?:\s* -> \s* (.*))?  #           return annotation
+#          )? $                   # and nothing more
+#          ''', re.VERBOSE)
+
 spec_func_sig_re = re.compile(
-    r'''^ ([\w.]*:)?             # module name
-          (\w+)  \s*             # thing name
-          (?: \((.*)\)           # optional: arguments
-           (?:\s* -> \s* (.*))?  #           return annotation
-          )? $                   # and nothing more
+    r'''^ ([a-zA-Z_]\w*)         # macro name
+          ((\s+\S+)*)            # optional: arguments
+          $                      # and nothing more
           ''', re.VERBOSE)
 
@@ -91 +97 @@
     def needs_arglist(self):
         return self.objtype == 'function'
-
-    def handle_signature(self, sig, signode):
-        if sig.startswith('#'):
-            return self._handle_record_signature(sig, signode)
-        elif sig[0].isupper():
-            return self._handle_macro_signature(sig, signode)
-        return self._handle_function_signature(sig, signode)
 
     def _resolve_module_name(self, signode, modname, name):
@@ -116 +115 @@
         return fullname
 
+    def handle_signature(self, sig, signode):
+        if sig.startswith('#'):
+            return self._handle_record_signature(sig, signode)
+        elif sig[0].isupper():
+            return self._handle_macro_signature(sig, signode)
+        return self._handle_function_signature(sig, signode)
+
     def _handle_record_signature(self, sig, signode):
         m = spec_record_sig_re.match(sig)
@@ -134 +140 @@
         if m is None:
             raise ValueError
-        modname, name, arglist, retann = m.groups()
+        #modname, name, arglist, retann = m.groups()
+        name, arglist, retann = m.groups()
+        modname = 'spec:def:'         # FIXME:
 
         fullname = self._resolve_module_name(signode, modname, name)