[Wisp-cvs] wisp/users/dig tran.py,1.100,1.101

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

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

Modified Files:
	tran.py 
Log Message:
added the include argument to interpret

Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- tran.py	17 May 2003 13:20:59 -0000	1.100
+++ tran.py	17 May 2003 13:26:32 -0000	1.101
@@ -307,7 +307,7 @@
             tok = this.toksrc.get_token()
         this.toksrc = None
 
-def interpret (toksrc, target, verbose = 0):
+def interpret (toksrc, target, include = [], verbose = 0):
     if isinstance(toksrc, list): toksrc = Macro_Cursor(toksrc)
     if isinstance(toksrc, str): toksrc = Lexer(toksrc)
 
@@ -315,6 +315,7 @@
 
     if isinstance(target, Linkie):
         interp = Interpreter(target)
+        for i in include: interp.run(i)
         interp.run(toksrc, verbose = verbose)
         if interp.regstack:
             raise 'regstack not empty after finishing interpretation', \
@@ -325,13 +326,15 @@
         sections = target[1:]
         if sections:
             interp = Interpreter(byte_order = byte_order, output = sections)
+            for i in include: interp.run(i)
             interp.run(toksrc, verbose = verbose)
             if interp.regstack:
                 raise 'regstack not empty after finishing interpretation', \
                       interp.regstack 
             return map((lambda n: interp.sections[n]), target[1:])
         else:
-            return interpret(toksrc, Linkie(byte_order))
+            return interpret(toksrc, Linkie(byte_order),
+                             include = include, verbose = verbose)
 
 def main ():
     from getopt import getopt