From 1cc08d959857b6986d21179a3cc0c08d3750e461 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 13 May 2019 08:08:29 -0400
Subject: [PATCH] Make precedence table top-bottom order reference...

in https://docs.python.org/2/reference/expressions.html#operator-precedence or
https://docs.python.org/3/reference/expressions.html#operator-precedence
.
---
 uncompyle6/semantics/consts.py | 86 +++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index 4928e79c..10707eea 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -27,83 +27,85 @@ else:
     maxint = sys.maxint
 
 
-# Operator precidence
-# See https://docs.python.org/2/reference/expressions.html
-# or https://docs.python.org/3/reference/expressions.html
-# for a list. The top to down order here is reversed
-# from the list in the above lin.
+# Operator precidence See
+# https://docs.python.org/2/reference/expressions.html#operator-precedence
+# or
+# https://docs.python.org/3/reference/expressions.html#operator-precedence
+# for a list. We keep the same top-to-botom order here as in the above links,
+# so we start with low precedence (high values) and go down in value.
 
-# Things at the bottom of this list below with low-value precedence will
+# Things at the bottom of this list below with high precedence (low value) will
 # tend to have parenthesis around them. Things at the top
 # of the list will tend not to have parenthesis around them.
 
-# Note: The values in this table tend to be even value. Inside
+# Note: The values in this table are even numbers. Inside
 # various templates we use odd values. Avoiding equal-precedent comparisons
 # avoids ambiguity what to do when the precedence is equal.
 
 
 PRECEDENCE = {
-    'yield_from':            102,
     'yield':                 102,
+    'yield_from':            102,
 
     '_mklambda':              30,
 
-    'ret_cond':               28,
-    'if_expr_true':           28,
-    'conditionalnot':         28,
-    'conditional_not_lamdba': 28, # Lambda expression
-    'conditional_lamdba':     28, # Lambda expression
     'conditional':            28, # Conditional expression
+    'conditional_lamdba':     28, # Lambda expression
+    'conditional_not_lamdba': 28, # Lambda expression
+    'conditionalnot':         28,
+    'if_expr_true':           28,
+    'ret_cond':               28,
 
-    'ret_or':                 26,
     'or':                     26, # Boolean OR
+    'ret_or':                 26,
 
-    'ret_and':                24,
     'and':                    24, # Boolean AND
-    'unary_not':              22, # Boolean NOT
     'compare':                20, # in, not in, is, is not, <, <=, >, >=, !=, ==
+    'ret_and':                24,
+    'unary_not':              22, # Boolean NOT
 
+    'BINARY_AND':             14, # Bitwise AND
     'BINARY_OR':              18, # Bitwise OR
     'BINARY_XOR':             16, # Bitwise XOR
-    'BINARY_AND':             14, # Bitwise AND
 
-    'BINARY_RSHIFT':          12, # Shifts >>
     'BINARY_LSHIFT':          12, # Shifts <<
+    'BINARY_RSHIFT':          12, # Shifts >>
 
-    'BINARY_SUBTRACT':        10,
-    'BINARY_ADD':             10,
+    'BINARY_ADD':             10, # -
+    'BINARY_SUBTRACT':        10, # +
 
-    'BINARY_MODULO':          8,
-    'BINARY_FLOOR_DIVIDE':    8,
-    'BINARY_TRUE_DIVIDE':     8,
-    'BINARY_DIVIDE':          8,
-    'BINARY_MULTIPLY':        8,
+    'BINARY_DIVIDE':          8,  # /
+    'BINARY_FLOOR_DIVIDE':    8,  # //
+    'BINARY_MATRIX_MULTIPLY': 8,  # @
+    'BINARY_MODULO':          8,  # Remainder, %
+    'BINARY_MULTIPLY':        8,  # *
+    'BINARY_TRUE_DIVIDE':     8,  # Division /
 
-    'unary_expr':             6,
+    'unary_expr':             6,  # +x, -x, ~x
 
-    'BINARY_POWER':           4,
+    'BINARY_POWER':           4,  # Exponentiation, *
 
-    'call':                   2,
-    'buildslice3':            2,
-    'buildslice2':            2,
-    'slice3':                 2,
-    'slice2':                 2,
-    'slice1':                 2,
-    'slice0':                 2,
+    'attribute':              2,  # x.attribute
+    'buildslice2':            2,  # x[index]
+    'buildslice3':            2,  # x[index:index]
+    'call':                   2,  # x(arguments...)
     'delete_subscript':       2,
+    'slice0':                 2,
+    'slice1':                 2,
+    'slice2':                 2,
+    'slice3':                 2,
     'store_subscript':        2,
-    'subscript2':             2,
     'subscript':              2,
-    'attribute':              2,
+    'subscript2':             2,
 
-    'generator_exp':          0,
-    'list_comp':              0,
-    'set_comp_expr':          0,
-    'set_comp':               0,
+    'dict':                   0,  # {expressions...}
     'dict_comp':              0,
+    'generator_exp':          0,  # (expressions...)
+    'list':                   0,  # [expressions...]
+    'list_comp':              0,
+    'set_comp':               0,
+    'set_comp_expr':          0,
     'unary_convert':          0,
-    'dict':                   0,
-    'list':                   0,
 }
 
 LINE_LENGTH = 80