1.1 --- a/compiler/ast.py Fri Nov 09 00:36:13 2012 +0100
1.2 +++ b/compiler/ast.py Thu Feb 21 22:18:23 2013 +0100
1.3 @@ -133,7 +133,7 @@
1.4 return "Add((%r, %r))" % (self.left, self.right)
1.5
1.6 def __str__(self):
1.7 - return "%s + %s" % (self.left, self.right)
1.8 + return "(%s + %s)" % (self.left, self.right)
1.9
1.10 def visit(self, visitor, *args):
1.11 return visitor.visitAdd(self, *args)
1.12 @@ -156,7 +156,7 @@
1.13 return "And(%r)" % (self.nodes,)
1.14
1.15 def __str__(self):
1.16 - return " and ".join(map(str, self.nodes))
1.17 + return "(%s)" % " and ".join(map(str, self.nodes))
1.18
1.19 def visit(self, visitor, *args):
1.20 return visitor.visitAnd(self, *args)
1.21 @@ -386,7 +386,7 @@
1.22 return "Bitand(%r)" % (self.nodes,)
1.23
1.24 def __str__(self):
1.25 - return " & ".join(map(str, self.nodes))
1.26 + return "(%s)" % " & ".join(map(str, self.nodes))
1.27
1.28 def visit(self, visitor, *args):
1.29 return visitor.visitBitand(self, *args)
1.30 @@ -410,7 +410,7 @@
1.31 return "Bitor(%r)" % (self.nodes,)
1.32
1.33 def __str__(self):
1.34 - return " | ".join(map(str, self.nodes))
1.35 + return "(%s)" % " | ".join(map(str, self.nodes))
1.36
1.37 def visit(self, visitor, *args):
1.38 return visitor.visitBitor(self, *args)
1.39 @@ -434,7 +434,7 @@
1.40 return "Bitxor(%r)" % (self.nodes,)
1.41
1.42 def __str__(self):
1.43 - return " ^ ".join(map(str, self.nodes))
1.44 + return "(%s)" % " ^ ".join(map(str, self.nodes))
1.45
1.46 def visit(self, visitor, *args):
1.47 return visitor.visitBitxor(self, *args)
1.48 @@ -698,7 +698,7 @@
1.49 return "Div((%r, %r))" % (self.left, self.right)
1.50
1.51 def __str__(self):
1.52 - return "%s / %s" % (self.left, self.right)
1.53 + return "(%s / %s)" % (self.left, self.right)
1.54
1.55 def visit(self, visitor, *args):
1.56 return visitor.visitDiv(self, *args)
1.57 @@ -775,7 +775,7 @@
1.58 return "FloorDiv((%r, %r))" % (self.left, self.right)
1.59
1.60 def __str__(self):
1.61 - return "%s // %s" % (self.left, self.right)
1.62 + return "(%s // %s)" % (self.left, self.right)
1.63
1.64 def visit(self, visitor, *args):
1.65 return visitor.visitFloorDiv(self, *args)
1.66 @@ -1235,7 +1235,7 @@
1.67 return "LeftShift((%r, %r))" % (self.left, self.right)
1.68
1.69 def __str__(self):
1.70 - return "%s << %s" % (self.left, self.right)
1.71 + return "(%s << %s)" % (self.left, self.right)
1.72
1.73 def visit(self, visitor, *args):
1.74 return visitor.visitLeftShift(self, *args)
1.75 @@ -1421,7 +1421,7 @@
1.76 return "Mod((%r, %r))" % (self.left, self.right)
1.77
1.78 def __str__(self):
1.79 - return "%s %% %s" % (self.left, self.right)
1.80 + return "(%s %% %s)" % (self.left, self.right)
1.81
1.82 def visit(self, visitor, *args):
1.83 return visitor.visitMod(self, *args)
1.84 @@ -1470,7 +1470,7 @@
1.85 return "Mul((%r, %r))" % (self.left, self.right)
1.86
1.87 def __str__(self):
1.88 - return "%s * %s" % (self.left, self.right)
1.89 + return "(%s * %s)" % (self.left, self.right)
1.90
1.91 def visit(self, visitor, *args):
1.92 return visitor.visitMul(self, *args)
1.93 @@ -1542,7 +1542,7 @@
1.94 return "Or(%r)" % (self.nodes,)
1.95
1.96 def __str__(self):
1.97 - return " or ".join(map(str, self.nodes))
1.98 + return "(%s)" % " or ".join(map(str, self.nodes))
1.99
1.100 def visit(self, visitor, *args):
1.101 return visitor.visitOr(self, *args)
1.102 @@ -1585,7 +1585,7 @@
1.103 return "Power((%r, %r))" % (self.left, self.right)
1.104
1.105 def __str__(self):
1.106 - return "%s ** %s" % (self.left, self.right)
1.107 + return "(%s ** %s)" % (self.left, self.right)
1.108
1.109 def visit(self, visitor, *args):
1.110 return visitor.visitPower(self, *args)
1.111 @@ -1726,7 +1726,7 @@
1.112 return "RightShift((%r, %r))" % (self.left, self.right)
1.113
1.114 def __str__(self):
1.115 - return "%s >> %s" % (self.left, self.right)
1.116 + return "(%s >> %s)" % (self.left, self.right)
1.117
1.118 def visit(self, visitor, *args):
1.119 return visitor.visitRightShift(self, *args)
1.120 @@ -1856,7 +1856,7 @@
1.121 return "Sub((%r, %r))" % (self.left, self.right)
1.122
1.123 def __str__(self):
1.124 - return "%s - %s" % (self.left, self.right)
1.125 + return "(%s - %s)" % (self.left, self.right)
1.126
1.127 def visit(self, visitor, *args):
1.128 return visitor.visitSub(self, *args)