Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-27 03:34:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 82338,82340-82341 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82338 | mark.dickinson | 2010-06-28 20:31:41 +0100 (Mon, 28 Jun 2010) | 9 lines

  Fix some shallow bugs in Demo/parser/unparse.py, and add tests:

    - insert commas between entries in del statement
    - left and right shifts were represented as >> and << (respectively); reverse
    - unindent properly after for: else:  or while: else:
    - add parens around the result of an unary operation
    - add parens around negative numbers, to avoid turning (-1)**2 into -1**2.
........
  r82340 | mark.dickinson | 2010-06-28 20:34:15 +0100 (Mon, 28 Jun 2010) | 1 line

  Fix typo in test_unparse.py.
........
  r82341 | mark.dickinson | 2010-06-28 20:38:19 +0100 (Mon, 28 Jun 2010) | 1 line

  Set svn:eol-style on test_unparse.py.
........
This commit is contained in:
Mark Dickinson 2010-06-28 19:44:20 +00:00
parent e893af5ab7
commit ae1000533a
2 changed files with 77 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Demo/parser/unparse.py
View file

@ -115,7 +115,7 @@ def _Continue(self, t):
def _Delete(self, t):
self.fill("del ")
self.dispatch(t.targets)
interleave(lambda: self.write(", "), self.dispatch, t.targets)
def _Assert(self, t):
self.fill("assert ")
@ -235,7 +235,7 @@ def _For(self, t):
self.fill("else")
self.enter()
self.dispatch(t.orelse)
self.leave
self.leave()
def _If(self, t):
self.fill("if ")
@ -260,7 +260,7 @@ def _While(self, t):
self.fill("else")
self.enter()
self.dispatch(t.orelse)
self.leave
self.leave()
def _With(self, t):
self.fill("with ")
@ -285,7 +285,16 @@ def _Repr(self, t):
self.write("`")
def _Num(self, t):
self.write(repr(t.n))
# There are no negative numeric literals in Python; however,
# some optimizations produce a negative Num in the AST. Add
# parentheses to avoid turning (-1)**2 into -1**2.
strnum = repr(t.n)
if strnum.startswith("-"):
self.write("(")
self.write(strnum)
self.write(")")
else:
self.write(repr(t.n))
def _List(self, t):
self.write("[")
@ -346,13 +355,14 @@ def _Tuple(self, t):
unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
def _UnaryOp(self, t):
self.write(self.unop[t.op.__class__.__name__])
self.write("(")
self.write(self.unop[t.op.__class__.__name__])
self.write(" ")
self.dispatch(t.operand)
self.write(")")
binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%",
"LShift":">>", "RShift":"<<", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
"LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
"FloorDiv":"//", "Pow": "**"}
def _BinOp(self, t):
self.write("(")