rename sig global table to sig*

akkartik · akkartik · commit d5f0c48fe5c5 · 2014-04-21T17:07:28.000-07:00
diff --git a/ac.scm b/ac.scm
@@ -619,18 +619,17 @@
        (namespace-set-variable-value! nm a)
        a))))
 
-(define fn-signatures (make-hash-table 'equal))
+(define sig* (make-hash-table 'equal))  ;; fn/macro name -> params
+(xdef sig* sig*)
 
-; This is a replacement for xdef that stores opeator signatures.
+; This is a replacement for xdef that stores operator signatures.
 ; Haven't started using it yet.
 
 (define (odef a parms b)
   (namespace-set-variable-value! (ac-global-name a) b)
-  (hash-table-put! fn-signatures a (list parms))
+  (hash-table-put! sig* a (list parms))
   b)
 
-(xdef sig fn-signatures)
-
 ; versions of car and cdr for parsing arguments for optional
 ; parameters, that yield nil for nil. maybe we should use
 ; full Arc car and cdr, so we can destructure more things
diff --git a/arc.arc b/arc.arc
@@ -29,7 +29,7 @@
 (assign do (annotate 'mac
              (fn args `((fn () ,@args)))))
 
-(sref sig 'args 'do)
+(sref sig* 'args 'do)
 (sref source-file* current-load-file* 'do)
 
 (assign safeset (annotate 'mac
@@ -40,21 +40,21 @@
                                (disp #\newline (stderr))))
                          (assign ,var ,val)))))
 
-(sref sig '(var val) 'safeset)
+(sref sig* '(var val) 'safeset)
 (sref source-file* current-load-file* 'safeset)
 
 (assign docify-body (fn (body)
                       (if (if (is (type car.body) 'string) cdr.body)
                         body
                         (cons nil body))))
 
-(sref sig '(body) 'docify-body)
+(sref sig* '(body) 'docify-body)
 (sref source-file* current-load-file* 'docify-body)
 
 (assign def (annotate 'mac
                (fn (name parms . body)
                  ((fn ((doc . body))
-                    `(do (sref sig ',parms ',name)
+                    `(do (sref sig* ',parms ',name)
                          (sref help* ',doc ',name)
                          (sref source-file* current-load-file* ',name)
                          (sref source* '(def ,name ,parms ,@body) ',name)
@@ -64,14 +64,14 @@
 (assign redef (annotate 'mac
                 (fn (name parms . body)
                   ((fn ((doc . body))
-                     `(do (sref sig ',parms ',name)
+                     `(do (sref sig* ',parms ',name)
                           (sref help* ',doc ',name)
                           (sref source-file* current-load-file* ',name)
                           (sref source* '(def ,name ,parms ,@body) ',name)
                           (assign ,name (fn ,parms ,@body))))  ; don't warn on redef
                     (docify-body body)))))
 
-(sref sig '(name parms . body) 'def)
+(sref sig* '(name parms . body) 'def)
 (sref source-file* current-load-file* 'def)
 
 (def caar (xs) (car:car xs))
@@ -115,7 +115,7 @@
 (assign mac (annotate 'mac
               (fn (name parms . body)
                 ((fn ((doc . body))
-                   `(do (sref sig ',parms ',name)
+                   `(do (sref sig* ',parms ',name)
                         (sref help* ',doc ',name)
                         (sref source-file* current-load-file* ',name)
                         (sref source* '(mac ,name ,parms ,@body) ',name)
@@ -125,14 +125,14 @@
 (assign remac (annotate 'mac
                 (fn (name parms . body)
                   ((fn ((doc . body))
-                     `(do (sref sig ',parms ',name)
+                     `(do (sref sig* ',parms ',name)
                           (sref help* ',doc ',name)
                           (sref source-file* current-load-file* ',name)
                           (sref source* '(mac ,name ,parms ,@body) ',name)
                           (assign ,name (annotate 'mac (fn ,parms ,@body)))))  ; don't warn on redef
                     (docify-body body)))))
 
-(sref sig '(name parms . body) 'mac)
+(sref sig* '(name parms . body) 'mac)
 (sref source-file* current-load-file* 'mac)
 
 (mac make-br-fn (body) `(fn (_) ,body))
diff --git a/lib/defpat.arc b/lib/defpat.arc
@@ -81,14 +81,13 @@
     (())       ())
     See also [[defpat]] "
   ; special handling for some macros because
-  ; their signatures are not in the (sig ...)
-  ; table
+  ; their signatures are not in the sig* table
   (if (in macro 'def 'mac)
       `(,macro ,(car body) ,@(*defpat-internal (cdr body)))
       (is macro 'fn)
       `(fn ,@(*defpat-internal body))
       ; else
-      (let s (sig macro)
+      (let s (sig* macro)
         (unless s
           (err (string "p-m: unknown macro " macro)))
         (unless (dotted s)
diff --git a/lib/help.arc b/lib/help.arc
@@ -47,7 +47,7 @@
       (when (or value doc)
         (pr "[" kind "]")
         (apply pr (n-of (- 4 (len:string kind)) " "))
-        (write (aif sig.name (cons name it)
+        (write (aif sig*.name (cons name it)
                     (in kind 'fn 'mac) (list name)
                     name))
         (prn)
@@ -60,5 +60,5 @@
     Otherwise, names of which `(string test)' is a prefix pass. "
   (let test (if (isa test 'fn) test
               (let pfx string.test [begins string._ pfx]))
-    (each f (sort < (keep test keys.sig))
+    (each f (sort < (keep test keys.sig*))
       (pr (helpstr sym.f nil)))))
diff --git a/lib/ppr.arc b/lib/ppr.arc
@@ -141,7 +141,7 @@
        (ppr-sub
          (pr "(")
          (withs (proc car.x
-                 args sig.proc
+                 args sig*.proc
                  n    len.args
                  str  (tostring:print proc)
                  l    len.str
