Python 3.1 compile bug. DRY Python 3.x rules ...

rocky · rocky · commit 6319d33fa02a · 2016-10-24T08:50:34.000-04:00
via inheritance
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
@@ -360,10 +360,9 @@ def p_expr3(self, args):
         # Python 3.4+
         expr ::= LOAD_CLASSDEREF
 
+        binary_subscr2 ::= expr expr DUP_TOP_TWO BINARY_SUBSCR
         # Python3 drops slice0..slice3
 
-        # In Python 2, DUP_TOP_TWO is DUP_TOPX_2
-        binary_subscr2 ::= expr expr DUP_TOP_TWO BINARY_SUBSCR
         '''
 
     @staticmethod
@@ -672,34 +671,33 @@ def add_custom_rules(self, tokens, customize):
         return
 
 
-class Python31Parser(Python3Parser):
-
-    def p_31(self, args):
+class Python33Parser(Python3Parser):
+    def p_33(self, args):
         """
         # Store locals is only in Python 3.0 to 3.3
         stmt ::= store_locals
         store_locals ::= LOAD_FAST STORE_LOCALS
+
+        # Python 3.3 adds yield from.
+        expr ::= yield_from
+        yield_from ::= expr expr YIELD_FROM
         """
 
 class Python32Parser(Python3Parser):
-
-    def p_32(self, args):
+    def p_32on(self, args):
         """
-        # Store locals is only in Python 3.0 to 3.3
+        # In Python 3.2+, DUP_TOPX is DUP_TOP_TWO
+        binary_subscr2 ::= expr expr DUP_TOP_TWO BINARY_SUBSCR
         stmt ::= store_locals
         store_locals ::= LOAD_FAST STORE_LOCALS
         """
+    pass
 
-class Python33Parser(Python3Parser):
-    def p_33(self, args):
-        """
-        # Store locals is only in Python 3.0 to 3.3
-        stmt ::= store_locals
-        store_locals ::= LOAD_FAST STORE_LOCALS
+class Python31Parser(Python32Parser):
 
-        # Python 3.3 adds yield from.
-        expr ::= yield_from
-        yield_from ::= expr expr YIELD_FROM
+    def p_31(self, args):
+        """
+        binary_subscr2 ::= expr expr DUP_TOPX BINARY_SUBSCR
         """
 
 class Python3ParserSingle(Python3Parser, PythonParserSingle):
diff --git a/uncompyle6/parsers/parse34.py b/uncompyle6/parsers/parse34.py
@@ -1,6 +1,6 @@
 #  Copyright (c) 2016 Rocky Bernstein
 """
-spark grammar differences over Python3 for Python 3.4.2.
+spark grammar differences over Python 3.2 for Python 3.4
 """
 
 from uncompyle6.parser import PythonParserSingle
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
@@ -1,14 +1,14 @@
 #  Copyright (c) 2016 Rocky Bernstein
 """
-spark grammar differences over Python3 for Python 3.5.
+spark grammar differences over Python 3.2 for Python 3.5.
 """
 from __future__ import print_function
 
 from uncompyle6.parser import PythonParserSingle
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
-from uncompyle6.parsers.parse3 import Python3Parser
+from uncompyle6.parsers.parse3 import Python32Parser
 
-class Python35Parser(Python3Parser):
+class Python35Parser(Python32Parser):
 
     def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG):
         super(Python35Parser, self).__init__(debug_parser)
