rename several of the generic attribute names for nodes. new node attrs are:

Exec: expr, locals, globals
Dict: items
Assert: test, fail
This commit is contained in:
Jeremy Hylton 2000-02-14 18:34:11 +00:00
parent 42907790b6
commit bf6267e6f8
2 changed files with 24 additions and 24 deletions

View file

@ -180,11 +180,11 @@ class If(Node):
class Exec(Node): class Exec(Node):
nodes['exec'] = 'Exec' nodes['exec'] = 'Exec'
def __init__(self, expr1, expr2, expr3): def __init__(self, expr, locals, globals):
self.expr1 = expr1 self.expr = expr
self.expr2 = expr2 self.locals = locals
self.expr3 = expr3 self.globals = globals
self._children = ('exec', expr1, expr2, expr3) self._children = ('exec', expr, locals, globals)
def __repr__(self): def __repr__(self):
return "Exec(%s,%s,%s)" % self._children[1:] return "Exec(%s,%s,%s)" % self._children[1:]
@ -362,9 +362,9 @@ class List(Node):
class Dict(Node): class Dict(Node):
nodes['dict'] = 'Dict' nodes['dict'] = 'Dict'
def __init__(self, keys): def __init__(self, items):
self.keys = keys self.items = items
self._children = ('dict', keys) self._children = ('dict', items)
def __repr__(self): def __repr__(self):
return "Dict(%s)" % self._children[1:] return "Dict(%s)" % self._children[1:]
@ -497,10 +497,10 @@ class Slice(Node):
class Assert(Node): class Assert(Node):
nodes['assert'] = 'Assert' nodes['assert'] = 'Assert'
def __init__(self, expr1, expr2): def __init__(self, test, fail):
self.expr1 = expr1 self.test = test
self.expr2 = expr2 self.fail = fail
self._children = ('assert', expr1, expr2) self._children = ('assert', test, fail)
def __repr__(self): def __repr__(self):
return "Assert(%s,%s)" % self._children[1:] return "Assert(%s,%s)" % self._children[1:]

View file

@ -180,11 +180,11 @@ class If(Node):
class Exec(Node): class Exec(Node):
nodes['exec'] = 'Exec' nodes['exec'] = 'Exec'
def __init__(self, expr1, expr2, expr3): def __init__(self, expr, locals, globals):
self.expr1 = expr1 self.expr = expr
self.expr2 = expr2 self.locals = locals
self.expr3 = expr3 self.globals = globals
self._children = ('exec', expr1, expr2, expr3) self._children = ('exec', expr, locals, globals)
def __repr__(self): def __repr__(self):
return "Exec(%s,%s,%s)" % self._children[1:] return "Exec(%s,%s,%s)" % self._children[1:]
@ -362,9 +362,9 @@ class List(Node):
class Dict(Node): class Dict(Node):
nodes['dict'] = 'Dict' nodes['dict'] = 'Dict'
def __init__(self, keys): def __init__(self, items):
self.keys = keys self.items = items
self._children = ('dict', keys) self._children = ('dict', items)
def __repr__(self): def __repr__(self):
return "Dict(%s)" % self._children[1:] return "Dict(%s)" % self._children[1:]
@ -497,10 +497,10 @@ class Slice(Node):
class Assert(Node): class Assert(Node):
nodes['assert'] = 'Assert' nodes['assert'] = 'Assert'
def __init__(self, expr1, expr2): def __init__(self, test, fail):
self.expr1 = expr1 self.test = test
self.expr2 = expr2 self.fail = fail
self._children = ('assert', expr1, expr2) self._children = ('assert', test, fail)
def __repr__(self): def __repr__(self):
return "Assert(%s,%s)" % self._children[1:] return "Assert(%s,%s)" % self._children[1:]