Update of /cvsroot/wisp/wisp/users/dig
In directory sc8-pr-cvs1:/tmp/cvs-serv15726
Modified Files:
tran-builtins tran.py
Log Message:
renamed State to interpreter.state
Index: tran-builtins
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran-builtins,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tran-builtins 1 May 2003 20:52:34 -0000 1.4
+++ tran-builtins 16 May 2003 15:24:28 -0000 1.5
@@ -50,13 +50,13 @@
if Meaning.has_key(name): raise 'duplicate declaration', name
current_recordee = Meaning[name] = []
def record_state (tok):
- global current_recordee, State
+ global current_recordee
if tok == Semicolon:
- State = outer_state
+ interpreter.state = outer_state
current_recordee = None
else:
current_recordee.append(tok)
- State = record_state
+ interpreter.state = record_state
:regs|family
if Meaning.has_key(family): raise 'duplicate declaration', tok
@@ -66,7 +66,7 @@
Registers[f] = family
current_register_index = 0
def regs_state (tok):
- global State, current_register_family, current_register_index
+ global current_register_family, current_register_index
if tok != Semicolon:
if Meaning.has_key(tok): raise 'duplicate declaration', tok
r = Register(current_register_family, current_register_index)
@@ -74,10 +74,10 @@
Registers[r] = tok
current_register_index += 1
else:
- State = outer_state
+ interpreter.state = outer_state
current_register_family += 1
current_register_index = None
- State = regs_state
+ interpreter.state = regs_state
align int
cursect.align(long(Regstack.pop()))
Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- tran.py 15 May 2003 13:45:26 -0000 1.72
+++ tran.py 16 May 2003 15:24:29 -0000 1.73
@@ -270,7 +270,7 @@
np = (name + '|').split('|')
name = np[0]
pa = np[1]
- g = 'cursect, Regstack, State, current_recordee, current_register_index'
+ g = 'cursect, Regstack, current_recordee, current_register_index'
exec 'def _p (%s):\n global %s\n%s\n' % (pa, g, code)
flags = 0
if pa: flags |= MA_PREFIX
@@ -278,9 +278,13 @@
current_recordee = None
current_register_family = 0
-State = outer_state
Registers = {Generic_Register: 'reg'} # for reverse translation
+class container (object): pass
+
+interpreter = container()
+interpreter.state = outer_state
+
verbose = 0
def main ():
@@ -308,7 +312,7 @@
tok = prep.get_token()
while tok <> None:
if verbose: print '(%s) %s' % (' '.join(map(str, Regstack)), tok)
- State(tok)
+ interpreter.state(tok)
tok = prep.get_token()
print 'TEXT'; Text.dump()
print 'DATA'; Data.dump()
|
