1.1 --- a/micropython/inspect.py Sat Jul 07 20:35:17 2012 +0200
1.2 +++ b/micropython/inspect.py Sat Jul 07 20:40:09 2012 +0200
1.3 @@ -549,9 +549,6 @@
1.4 self.use_specific_attribute(operator_module.full_name(), operator_fn)
1.5 return self.OP(node)
1.6
1.7 - _visitBinary = \
1.8 - _visitUnary = _visitOperator
1.9 -
1.10 def _visitAttr(self, expr, attrname, node):
1.11
1.12 """
1.13 @@ -717,7 +714,7 @@
1.14
1.15 # Specific handler methods.
1.16
1.17 - visitAdd = _visitBinary
1.18 + visitAdd = _visitOperator
1.19
1.20 visitAnd = TEST_OP
1.21
1.22 @@ -819,11 +816,11 @@
1.23
1.24 visitBackquote = OP
1.25
1.26 - visitBitand = _visitBinary
1.27 + visitBitand = _visitOperator
1.28
1.29 - visitBitor = _visitBinary
1.30 + visitBitor = _visitOperator
1.31
1.32 - visitBitxor = _visitBinary
1.33 + visitBitxor = _visitOperator
1.34
1.35 def visitBreak(self, node):
1.36 self.NOP(node)
1.37 @@ -882,7 +879,7 @@
1.38 # NOTE: Potentially dubious measure to permit __init__ availability.
1.39 # If no bases exist, adopt the 'object' class.
1.40
1.41 - if not node.bases and not (self.name == "__builtins__" and node.name == "object") :
1.42 + if not node.bases and not (self.name == "__builtins__" and node.name == "object"):
1.43 expr = self.dispatch(compiler.ast.Name("object"))
1.44 cls.add_base(expr.get_value())
1.45
1.46 @@ -948,7 +945,7 @@
1.47
1.48 visitDiscard = NOP
1.49
1.50 - visitDiv = _visitBinary
1.51 + visitDiv = _visitOperator
1.52
1.53 visitEllipsis = NOP
1.54
1.55 @@ -956,7 +953,7 @@
1.56
1.57 visitExpression = OP
1.58
1.59 - visitFloorDiv = _visitBinary
1.60 + visitFloorDiv = _visitOperator
1.61
1.62 def visitFor(self, node):
1.63 self.new_branchpoint(node)
1.64 @@ -1160,7 +1157,7 @@
1.65 for n in module.keys():
1.66 module.modify_name(n)
1.67
1.68 - visitInvert = _visitUnary
1.69 + visitInvert = _visitOperator
1.70
1.71 def visitKeyword(self, node):
1.72 self.dispatch(node.expr)
1.73 @@ -1172,7 +1169,7 @@
1.74 self.use_specific_attribute(None, fn.name)
1.75 return fn
1.76
1.77 - visitLeftShift = _visitBinary
1.78 + visitLeftShift = _visitOperator
1.79
1.80 def visitList(self, node):
1.81 self.use_specific_attribute("__builtins__", "list")
1.82 @@ -1249,7 +1246,7 @@
1.83
1.84 self.merge_branches()
1.85
1.86 - visitMod = _visitBinary
1.87 + visitMod = _visitOperator
1.88
1.89 def visitModule(self, node):
1.90
1.91 @@ -1258,7 +1255,7 @@
1.92 node.unit = self
1.93 return self.dispatch(node.node)
1.94
1.95 - visitMul = _visitBinary
1.96 + visitMul = _visitOperator
1.97
1.98 def visitName(self, node):
1.99 return self.get_namespace().get_using_node(node.name, node) or make_instance()
1.100 @@ -1272,7 +1269,7 @@
1.101
1.102 visitPass = NOP
1.103
1.104 - visitPower = _visitBinary
1.105 + visitPower = _visitOperator
1.106
1.107 def _visitPrint(self, node, function_name):
1.108 self.NOP(node)
1.109 @@ -1288,7 +1285,7 @@
1.110
1.111 visitReturn = NOP_ABANDON
1.112
1.113 - visitRightShift = _visitBinary
1.114 + visitRightShift = _visitOperator
1.115
1.116 def visitSlice(self, node):
1.117 return self._visitOperator(node, self.in_assignment and "AssSlice" or "Slice")
1.118 @@ -1299,7 +1296,7 @@
1.119 for n in node.nodes:
1.120 self.dispatch(n)
1.121
1.122 - visitSub = _visitBinary
1.123 + visitSub = _visitOperator
1.124
1.125 def visitSubscript(self, node):
1.126 return self._visitOperator(node, self.in_assignment and "AssSubscript" or "Subscript")
1.127 @@ -1342,9 +1339,9 @@
1.128
1.129 visitTuple = OP
1.130
1.131 - visitUnaryAdd = _visitUnary
1.132 + visitUnaryAdd = _visitOperator
1.133
1.134 - visitUnarySub = _visitUnary
1.135 + visitUnarySub = _visitOperator
1.136
1.137 def visitWhile(self, node):
1.138 self.use_name("__bool__", node)