# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1341874482 -7200
# Node ID 83d4c2e59b00a72f585da2f5a0c6fe251e8405ea
# Parent  ea9ae63949ec1451155d67a8eee89c4702b69407
Simplified operator function name output, fixing the binary bit operators.

diff -r ea9ae63949ec -r 83d4c2e59b00 micropython/report.py
--- a/micropython/report.py	Tue Jul 10 00:38:33 2012 +0200
+++ b/micropython/report.py	Tue Jul 10 00:54:42 2012 +0200
@@ -976,7 +976,8 @@
 
     # Expression-related helper methods.
 
-    def _visitBitBinary(self, node, name, symbol):
+    def _visitBitBinary(self, node, symbol):
+        name = operator_functions[node.__class__.__name__]
         self._span_start(name)
         first = 1
         for node in node.nodes:
@@ -986,14 +987,16 @@
             first = 0
         self._span_end()
 
-    def _visitBinary(self, node, name, symbol):
+    def _visitBinary(self, node, symbol):
+        name = operator_functions[node.__class__.__name__]
         self._span_start(name)
         self.dispatch(node.left)
         self._op(symbol, name, 1)
         self.dispatch(node.right)
         self._span_end()
 
-    def _visitUnary(self, node, name, symbol):
+    def _visitUnary(self, node, symbol):
+        name = operator_functions[node.__class__.__name__]
         self._span_start(name)
         self._op(symbol, name, trailing=0)
         self.dispatch(node.expr)
@@ -1002,7 +1005,7 @@
     # Expressions.
 
     def visitAdd(self, node):
-        self._visitBinary(node, "add", "+")
+        self._visitBinary(node, "+")
 
     def visitAnd(self, node):
         self._span_start("and")
@@ -1053,13 +1056,13 @@
         self._span_end()
 
     def visitBitand(self, node):
-        self._visitBitBinary(node, "bitand", "&")
+        self._visitBitBinary(node, "&")
 
     def visitBitor(self, node):
-        self._visitBitBinary(node, "bitor", "|")
+        self._visitBitBinary(node, "|")
 
     def visitBitxor(self, node):
-        self._visitBitBinary(node, "bitxor", "^")
+        self._visitBitBinary(node, "^")
 
     def visitCallFunc(self, node):
         self._span_start("callfunc")
@@ -1109,10 +1112,10 @@
         self._span_end()
 
     def visitDiv(self, node):
-        self._visitBinary(node, "div", "/")
+        self._visitBinary(node, "/")
 
     def visitFloorDiv(self, node):
-        self._visitBinary(node, "floordiv", "//")
+        self._visitBinary(node, "//")
 
     def visitGetattr(self, node):
         possible_types = self.possible_accessor_types(node, defining_users=0)
@@ -1181,7 +1184,7 @@
         self._span_end()
 
     def visitInvert(self, node):
-        self._visitUnary(node, "invert", "~")
+        self._visitUnary(node, "~")
 
     def visitKeyword(self, node):
         self._span_start("keyword-arg")
@@ -1207,7 +1210,7 @@
         self._span_end()
 
     def visitLeftShift(self, node):
-        self._visitBinary(node, "lshift", "<<")
+        self._visitBinary(node, "<<")
 
     visitList = visitAssList
 
@@ -1243,10 +1246,10 @@
         self._span_end()
 
     def visitMod(self, node):
-        self._visitBinary(node, "mod", "%")
+        self._visitBinary(node, "%")
 
     def visitMul(self, node):
-        self._visitBinary(node, "mul", "*")
+        self._visitBinary(node, "*")
 
     def visitName(self, node):
         if hasattr(node, "_scope"):
@@ -1277,10 +1280,10 @@
         self._span_end()
 
     def visitPower(self, node):
-        self._visitBinary(node, "pow", "**")
+        self._visitBinary(node, "**")
 
     def visitRightShift(self, node):
-        self._visitBinary(node, "rshift", ">>")
+        self._visitBinary(node, ">>")
 
     def visitSlice(self, node):
         self._span_start("slice")
@@ -1305,7 +1308,7 @@
         self._span_end()
 
     def visitSub(self, node):
-        self._visitBinary(node, "sub", "-")
+        self._visitBinary(node, "-")
 
     def visitSubscript(self, node):
         self._span_start("subscript")
@@ -1323,10 +1326,10 @@
     visitTuple = visitAssTuple
 
     def visitUnaryAdd(self, node):
-        self._visitUnary(node, "add", "+")
+        self._visitUnary(node, "+")
 
     def visitUnarySub(self, node):
-        self._visitUnary(node, "sub", "-")
+        self._visitUnary(node, "-")
 
     # Output preparation methods.