[Wisp-cvs] wisp/users/dig builtin.tran,NONE,1.1 Makefile.am,1.23,1.24 pe.tran,1.5,1.6 tran.py,1.109,1.110

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

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

Modified Files:
	Makefile.am pe.tran tran.py 
Added Files:
	builtin.tran 
Log Message:
moved |(opt)| to the new builtin.tran module

--- NEW FILE: builtin.tran ---
\\\\ builtin.tran - builtin macros
\
\ Copyleft © 2003 by Andres Soolo (di...@us...)
\ This file is licensed under the GNU GPL v2.  If you
\ don't know what that means, please do read the GPL.
\
\\\\ @(#) $Id: builtin.tran,v 1.1 2003/05/18 16:01:14 digg Exp $

:[ sym ] (opt) \ ( symbol -- symbol )
    dup weaker 0 swap bind
;

\ vim: ft=tran

Index: Makefile.am
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	18 May 2003 14:37:03 -0000	1.23
+++ Makefile.am	18 May 2003 16:01:14 -0000	1.24
@@ -8,6 +8,7 @@
 
 EXTRA_DIST = .cvsignore .pycheckrc struburn.wisp bits.py linkie.py \
     coff.py elf.py pe.py \
+    builtin.tran \
     i8086.tran i80386.tran i80486.tran pentium.tran ia16.tran ia32.tran \
     coff.tran elf.tran mz.tran pe.tran \
     winapi.tran \

Index: pe.tran
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/pe.tran,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pe.tran	18 May 2003 15:56:30 -0000	1.5
+++ pe.tran	18 May 2003 16:01:14 -0000	1.6
@@ -31,10 +31,6 @@
     #xCD b, #x21 b,        \ int 0x21
 ;
 
-:[ sym ] (opt) \ ( symbol -- symbol )
-    dup weaker 0 swap bind
-;
-
 :[ ] make-pe-section-header \ ( name -- )
     4 align
     dup 8 padded-symbol,

Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- tran.py	18 May 2003 15:56:30 -0000	1.109
+++ tran.py	18 May 2003 16:01:14 -0000	1.110
@@ -260,6 +260,7 @@
         this.regstack = []
         this.state = this.outer_state
         this.toksrc = None # only used during interpretation
+        this.run('builtin.tran')
     def match_generator (this, root):
         yield root
         if len(this.regstack) < 1: yield None # want more registers