Misc: long lists, DRY 2/3 grammars, '%' count

parse{2,3,r}.py: DRY Python expressions between Python 2 and 3
pysource.py, fragment.py, parser.py: handle long lists by grouping in chunks of 32
and 256
bin/uncompyle6: count %s properly

uncompyle6/parsers/parse3.py

@@ -371,145 +371,10 @@ class Python3Parser(PythonParser):
 
         '''
 
-    def p_expr(self, args):
+    def p_expr3(self, args):
         '''
-        expr ::= _mklambda
-        expr ::= SET_LINENO
-        expr ::= LOAD_FAST
-        expr ::= LOAD_NAME
-        expr ::= LOAD_CONST
-        expr ::= LOAD_GLOBAL
-        expr ::= LOAD_DEREF
-        expr ::= LOAD_LOCALS
         expr ::= LOAD_CLASSNAME
-        expr ::= load_attr
-        expr ::= binary_expr
-        expr ::= binary_expr_na
-        expr ::= build_list
-        expr ::= cmp
-        expr ::= mapexpr
-        expr ::= and
-        expr ::= and2
-        expr ::= or
-        expr ::= unary_expr
-        expr ::= call_function
-        expr ::= unary_not
-        expr ::= unary_convert
-        expr ::= binary_subscr
-        expr ::= binary_subscr2
-        expr ::= load_attr
-        expr ::= get_iter
-        expr ::= slice0
-        expr ::= slice1
-        expr ::= slice2
-        expr ::= slice3
-        expr ::= buildslice2
-        expr ::= buildslice3
-        expr ::= yield
-
-        binary_expr ::= expr expr binary_op
-        binary_op ::= BINARY_ADD
-        binary_op ::= BINARY_MULTIPLY
-        binary_op ::= BINARY_AND
-        binary_op ::= BINARY_OR
-        binary_op ::= BINARY_XOR
-        binary_op ::= BINARY_SUBTRACT
-        binary_op ::= BINARY_DIVIDE
-        binary_op ::= BINARY_TRUE_DIVIDE
-        binary_op ::= BINARY_FLOOR_DIVIDE
-        binary_op ::= BINARY_MODULO
-        binary_op ::= BINARY_LSHIFT
-        binary_op ::= BINARY_RSHIFT
-        binary_op ::= BINARY_POWER
-
-        unary_expr ::= expr unary_op
-        unary_op ::= UNARY_POSITIVE
-        unary_op ::= UNARY_NEGATIVE
-        unary_op ::= UNARY_INVERT
-
-        unary_not ::= expr UNARY_NOT
-        unary_convert ::= expr UNARY_CONVERT
-
-        binary_subscr ::= expr expr BINARY_SUBSCR
-        binary_subscr2 ::= expr expr DUP_TOPX_2 BINARY_SUBSCR
-
-        load_attr ::= expr LOAD_ATTR
-        get_iter ::= expr GET_ITER
-
         # Python3 drops slice0..slice3
-        buildslice3 ::= expr expr expr BUILD_SLICE_3
-        buildslice2 ::= expr expr BUILD_SLICE_2
-
-        yield ::= expr YIELD_VALUE
-
-        _mklambda ::= load_closure mklambda
-        _mklambda ::= mklambda
-
-        or   ::= expr jmp_true expr _come_from
-        or   ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
-        and  ::= expr jmp_false expr _come_from
-        and  ::= expr JUMP_IF_FALSE_OR_POP expr COME_FROM
-        and2 ::= _jump jmp_false COME_FROM expr COME_FROM
-
-        expr ::= conditional
-        conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
-        conditional ::= expr jmp_false expr JUMP_ABSOLUTE expr
-        expr ::= conditionalnot
-        conditionalnot ::= expr jmp_true expr _jump expr COME_FROM
-
-        ret_expr ::= expr
-        ret_expr ::= ret_and
-        ret_expr ::= ret_or
-
-        ret_expr_or_cond ::= ret_expr
-        ret_expr_or_cond ::= ret_cond
-        ret_expr_or_cond ::= ret_cond_not
-
-        ret_and  ::= expr JUMP_IF_FALSE_OR_POP ret_expr_or_cond COME_FROM
-        ret_or   ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM
-        ret_cond ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF ret_expr_or_cond
-        ret_cond_not ::= expr POP_JUMP_IF_TRUE expr RETURN_END_IF ret_expr_or_cond
-
-        stmt ::= return_lambda
-        stmt ::= conditional_lambda
-
-        return_lambda ::= ret_expr RETURN_VALUE LAMBDA_MARKER
-        conditional_lambda ::= expr jmp_false return_if_stmt return_stmt LAMBDA_MARKER
-
-        cmp ::= cmp_list
-        cmp ::= compare
-        compare ::= expr expr COMPARE_OP
-        cmp_list ::= expr cmp_list1 ROT_TWO POP_TOP
-                _come_from
-        cmp_list1 ::= expr DUP_TOP ROT_THREE
-                COMPARE_OP JUMP_IF_FALSE_OR_POP
-                cmp_list1 COME_FROM
-        cmp_list1 ::= expr DUP_TOP ROT_THREE
-                COMPARE_OP jmp_false
-                cmp_list1 _come_from
-        cmp_list1 ::= expr DUP_TOP ROT_THREE
-                COMPARE_OP JUMP_IF_FALSE_OR_POP
-                cmp_list2 COME_FROM
-        cmp_list1 ::= expr DUP_TOP ROT_THREE
-                COMPARE_OP jmp_false
-                cmp_list2 _come_from
-        cmp_list2 ::= expr COMPARE_OP JUMP_FORWARD
-        cmp_list2 ::= expr COMPARE_OP RETURN_VALUE
-        mapexpr ::= BUILD_MAP kvlist
-
-        kvlist ::= kvlist kv
-        kvlist ::= kvlist kv2
-        kvlist ::= kvlist kv3
-        kvlist ::=
-
-        kv ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
-        kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
-        kv3 ::= expr expr STORE_MAP
-
-        exprlist ::= exprlist expr
-        exprlist ::= expr
-
-        nullexprlist ::=
         '''
 
     @staticmethod
@@ -613,7 +478,9 @@ class Python3Parser(PythonParser):
             elif opname == 'LOAD_BUILD_CLASS':
                 self.custom_build_class_rule(opname, i, token, tokens, customize)
             elif opname_base in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
-                rule = 'build_list ::= ' + 'expr ' * token.attr + opname
+                v = token.attr
+                rule = ('build_list ::= ' + 'expr1024 ' * int(v//1024) +
+                                        'expr32 ' * int((v//32)%32) + 'expr '*(v%32) + opname)
                 self.add_unique_rule(rule, opname, token.attr, customize)
             elif self.version >= 3.5 and opname_base == 'BUILD_MAP':
                 kvlist_n = "kvlist_%s" % token.attr