[Wisp-cvs] wisp/users/dig tran.py,1.50,1.51

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

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

Modified Files:
	tran.py 
Log Message:
minor cleanup

Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tran.py	22 Apr 2003 15:09:09 -0000	1.50
+++ tran.py	22 Apr 2003 15:14:27 -0000	1.51
@@ -400,29 +400,10 @@
     'sym':           ('simple',  Class_Marker('sym')),
 }
 
-# Emitters
-def byte_comma_int (n): cursect.emit_byte(long(n) % 0x100L)
-Meaning['b, int'] = 'builtin', byte_comma_int, 1
-def byte_comma_sym (a): cursect.emit_byte_sum([str(a)])
-Meaning['b, sym'] = 'builtin', byte_comma_sym, 1
-
-def wyde_comma_int (n): cursect.emit_wyde(long(n) % 0x10000L)
-Meaning['w, int'] = 'builtin', wyde_comma_int, 1
-def wyde_comma_sym (a): cursect.emit_wyde_sum([str(a)])
-Meaning['w, sym'] = 'builtin', wyde_comma_sym, 1
-
-def tetra_comma_int (n): cursect.emit_tetra(long(n) % 0x100000000L)
-Meaning['t, int'] = 'builtin', tetra_comma_int, 1
-def tetra_comma_sym (a): cursect.emit_tetra_sum([str(a)])
-Meaning['t, sym'] = 'builtin', tetra_comma_sym, 1
-
-
-# End of builtins
 BUILTINS = '''
 
 $-t, sym
-    a = Regstack.pop()
-    cursect.emit_tetra_sum([str(n)], relative = 1)
+    cursect.emit_tetra_sum([str(Regstack.pop())], relative = 1)
 
 .bss
     cursect = Bss
@@ -436,6 +417,12 @@
 //
     Regstack = []
 
+b, int
+    cursect.emit_byte(long(Regstack.pop()) % 0x100)
+
+b, sym
+    cursect.emit_byte_sum([str(Regstack.pop())])
+
 drop any
     Regstack.pop()
 
@@ -445,6 +432,18 @@
 swap any any
     y = Regstack.pop(); x = Regstack.pop()
     Regstack.append(y); Regstack.append(x)
+
+t, int
+    cursect.emit_tetra(long(Regstack.pop()) % 0x100000000L)
+
+t, sym
+    cursect.emit_tetra_sum([str(Regstack.pop())])
+
+w, int
+    cursect.emit_wyde(long(Regstack.pop()) % 0x10000L)
+
+w, sym
+    cursect.emit_wyde_sum([str(Regstack.pop())])
 '''
 
 for b in BUILTINS.split('\n\n'):