[pypy-svn] r29792 - pypy/dist/pypy/interpreter/astcompiler
mwh at codespeak.net
mwh at codespeak.net
Sat Jul 8 11:14:56 CEST 2006
Author: mwh
Date: Sat Jul 8 11:14:44 2006
New Revision: 29792
Modified:
pypy/dist/pypy/interpreter/astcompiler/ast.py
pypy/dist/pypy/interpreter/astcompiler/astgen.py
Log:
(mwh, misto)
fix some variable names in generated code, oops.
Modified: pypy/dist/pypy/interpreter/astcompiler/ast.py
==============================================================================
--- pypy/dist/pypy/interpreter/astcompiler/ast.py (original)
+++ pypy/dist/pypy/interpreter/astcompiler/ast.py Sat Jul 8 11:14:44 2006
@@ -358,8 +358,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitAnd = space.getattr(w_visitor, space.wrap("visitAnd"))
w_visitAnd_args = Arguments(space, [ w_self ])
@@ -538,8 +538,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitAssList = space.getattr(w_visitor, space.wrap("visitAssList"))
w_visitAssList_args = Arguments(space, [ w_self ])
@@ -675,8 +675,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitAssTuple = space.getattr(w_visitor, space.wrap("visitAssTuple"))
w_visitAssTuple_args = Arguments(space, [ w_self ])
@@ -836,8 +836,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_expr = space.getattr(w_self, space.wrap("expr"))
w_mutate_expr = space.getattr(w_expr, space.wrap("mutate"))
@@ -1129,8 +1129,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitBitand = space.getattr(w_visitor, space.wrap("visitBitand"))
w_visitBitand_args = Arguments(space, [ w_self ])
@@ -1194,8 +1194,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitBitor = space.getattr(w_visitor, space.wrap("visitBitor"))
w_visitBitor_args = Arguments(space, [ w_self ])
@@ -1259,8 +1259,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitBitxor = space.getattr(w_visitor, space.wrap("visitBitxor"))
w_visitBitxor_args = Arguments(space, [ w_self ])
@@ -1414,8 +1414,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_star_args = space.getattr(w_self, space.wrap("star_args"))
if space.is_w(w_star_args, space.w_None):
@@ -1525,8 +1525,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_code = space.getattr(w_self, space.wrap("code"))
w_mutate_code = space.getattr(w_code, space.wrap("mutate"))
@@ -1638,8 +1638,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitCompare = space.getattr(w_visitor, space.wrap("visitCompare"))
w_visitCompare_args = Arguments(space, [ w_self ])
@@ -1884,8 +1884,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitDecorators = space.getattr(w_visitor, space.wrap("visitDecorators"))
w_visitDecorators_args = Arguments(space, [ w_self ])
@@ -1972,8 +1972,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitDict = space.getattr(w_visitor, space.wrap("visitDict"))
w_visitDict_args = Arguments(space, [ w_self ])
@@ -2664,8 +2664,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_list = space.getattr(w_self, space.wrap("defaults"))
list_w = space.unpackiterable(w_list)
@@ -2674,8 +2674,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_code = space.getattr(w_self, space.wrap("code"))
w_mutate_code = space.getattr(w_code, space.wrap("mutate"))
@@ -2849,8 +2849,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitGenExprFor = space.getattr(w_visitor, space.wrap("visitGenExprFor"))
w_visitGenExprFor_args = Arguments(space, [ w_self ])
@@ -2991,8 +2991,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitGenExprInner = space.getattr(w_visitor, space.wrap("visitGenExprInner"))
w_visitGenExprInner_args = Arguments(space, [ w_self ])
@@ -3214,8 +3214,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_else_ = space.getattr(w_self, space.wrap("else_"))
if space.is_w(w_else_, space.w_None):
@@ -3521,8 +3521,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_list = space.getattr(w_self, space.wrap("defaults"))
list_w = space.unpackiterable(w_list)
@@ -3531,8 +3531,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_code = space.getattr(w_self, space.wrap("code"))
w_mutate_code = space.getattr(w_code, space.wrap("mutate"))
@@ -3677,8 +3677,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitList = space.getattr(w_visitor, space.wrap("visitList"))
w_visitList_args = Arguments(space, [ w_self ])
@@ -3760,8 +3760,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitListComp = space.getattr(w_visitor, space.wrap("visitListComp"))
w_visitListComp_args = Arguments(space, [ w_self ])
@@ -3860,8 +3860,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitListCompFor = space.getattr(w_visitor, space.wrap("visitListCompFor"))
w_visitListCompFor_args = Arguments(space, [ w_self ])
@@ -4343,8 +4343,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitOr = space.getattr(w_visitor, space.wrap("visitOr"))
w_visitOr_args = Arguments(space, [ w_self ])
@@ -4539,8 +4539,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_dest = space.getattr(w_self, space.wrap("dest"))
if space.is_w(w_dest, space.w_None):
@@ -4629,8 +4629,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_dest = space.getattr(w_self, space.wrap("dest"))
if space.is_w(w_dest, space.w_None):
@@ -5068,8 +5068,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitSliceobj = space.getattr(w_visitor, space.wrap("visitSliceobj"))
w_visitSliceobj_args = Arguments(space, [ w_self ])
@@ -5133,8 +5133,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitStmt = space.getattr(w_visitor, space.wrap("visitStmt"))
w_visitStmt_args = Arguments(space, [ w_self ])
@@ -5412,8 +5412,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_else_ = space.getattr(w_self, space.wrap("else_"))
if space.is_w(w_else_, space.w_None):
@@ -5558,8 +5558,8 @@
w_item_mutate = space.getattr(w_item, space.wrap("mutate"))
w_item_mutate_args = Arguments(space, [ w_visitor ])
w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)
- newitem_w.append(w_newitem)
- w_newitem = space.newlist(newitem_w)
+ newlist_w.append(w_newitem)
+ w_newlist = space.newlist(newlist_w)
space.setslice(w_list, space.w_None, space.w_None, w_newlist)
w_visitTuple = space.getattr(w_visitor, space.wrap("visitTuple"))
w_visitTuple_args = Arguments(space, [ w_self ])
Modified: pypy/dist/pypy/interpreter/astcompiler/astgen.py
==============================================================================
--- pypy/dist/pypy/interpreter/astcompiler/astgen.py (original)
+++ pypy/dist/pypy/interpreter/astcompiler/astgen.py Sat Jul 8 11:14:44 2006
@@ -401,8 +401,8 @@
print >> buf, ' w_item_mutate = space.getattr(w_item, space.wrap("mutate"))'
print >> buf, ' w_item_mutate_args = Arguments(space, [ w_visitor ])'
print >> buf, ' w_newitem = space.call_args(w_item_mutate, w_item_mutate_args)'
- print >> buf, ' newitem_w.append(w_newitem)'
- print >> buf, ' w_newitem = space.newlist(newitem_w)'
+ print >> buf, ' newlist_w.append(w_newitem)'
+ print >> buf, ' w_newlist = space.newlist(newlist_w)'
print >> buf, ' space.setslice(w_list, space.w_None, space.w_None, w_newlist)'
More information about the Pypy-commit
mailing list