refact: Put const on the right side for commutative BINARY nodes

Author: boriel

src/api/optimize.py

@@ -221,6 +221,10 @@ def visit_ADDRESS(self, node):
 
     def visit_BINARY(self, node: symbols.BINARY):
         if self.O_LEVEL > 1 and node.operator in ("PLUS", "MUL"):
+            if chk.is_number(node.left) and not chk.is_number(node.right):
+                node.left, node.right = node.right, node.left
+                node = yield self.generic_visit(node)
+
             if node.left.token == "BINARY" and node.left.operator == node.operator and chk.is_number(node.right):
                 left = ll = None
                 if chk.is_number(node.left.right):
@@ -240,25 +244,6 @@ def visit_BINARY(self, node: symbols.BINARY):
                     )
                     node.left = left
                     node.right = right
-            elif node.right.token == "BINARY" and node.right.operator == node.operator and chk.is_number(node.left):
-                right = rr = None
-                if chk.is_number(node.right.left):
-                    right = node.right.right
-                    rr = node.right.left
-                elif chk.is_number(node.right.right):
-                    right = node.right.left
-                    rr = node.right.right
-
-                if right is not None:
-                    left = yield symbols.BINARY.make_node(
-                        operator=node.operator,
-                        left=node.left,
-                        right=rr,
-                        lineno=node.lineno,
-                        func=node.func,
-                    )
-                    node.left = left
-                    node.right = right
 
         node = yield self.generic_visit(node)  # This might convert consts to numbers if possible
         # Retry folding