[Wisp-cvs] wisp/users/dig tran.py,1.62,1.63

[<di...@us...>]

Update of /cvsroot/wisp/wisp/users/dig
In directory sc8-pr-cvs1:/tmp/cvs-serv5942

Modified Files:
	tran.py 
Log Message:
minor cleanup

Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- tran.py	22 Apr 2003 15:52:58 -0000	1.62
+++ tran.py	22 Apr 2003 15:57:17 -0000	1.63
@@ -184,17 +184,18 @@
         except StopIteration:
             raise 'meaningless word', root
         m = Meaning[tok]
-        mtype = m[0]
-        if mtype == 'builtin':
-            if m[2] & MA_PREFIX:
-                tok = prep.get_token()
-                if not isinstance(tok, str): raise 'word expected', tok
-                m[1](tok)
-            else:
-                m[1]()
-        elif mtype == 'macro': prep.push_macro(m[1])
-        elif mtype == 'simple': Regstack.append(m[1])
-        else: raise 'Unknown meaning type in', `Meaning[tok]`
+        if isinstance(m, list): prep.push_macro(m)
+        else:
+            mtype = m[0]
+            if mtype == 'builtin':
+                if m[2] & MA_PREFIX:
+                    tok = prep.get_token()
+                    if not isinstance(tok, str): raise 'word expected', tok
+                    m[1](tok)
+                else:
+                    m[1]()
+            elif mtype == 'simple': Regstack.append(m[1])
+            else: raise 'Unknown meaning type in', `Meaning[tok]`
     else: raise 'bad token', tok
 
 # Main output sections.
@@ -243,9 +244,7 @@
     name = ' '.join([name] + [matchers(i).next() for i in Regstack])
     Regstack = []
     if Meaning.has_key(name): raise 'duplicate declaration', name
-    newmac = []
-    Meaning[name] = ('macro', newmac)
-    current_recordee = newmac
+    current_recordee = Meaning[name] = []
     def record_state (tok):
         global current_recordee, State
         if tok == Semicolon: