From 9062f19a97c55947373eddb3979d5b15365469ad Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 27 Nov 2017 21:55:26 -0500 Subject: [PATCH] 2.4 grammar reduction --- uncompyle6/parsers/parse24.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/uncompyle6/parsers/parse24.py b/uncompyle6/parsers/parse24.py index 208becf1..0eb121a8 100644 --- a/uncompyle6/parsers/parse24.py +++ b/uncompyle6/parsers/parse24.py @@ -33,9 +33,6 @@ class Python24Parser(Python25Parser): importmultiple ::= filler LOAD_CONST import_as imports_cont import_cont ::= filler LOAD_CONST import_as - import_as ::= IMPORT_NAME load_attrs designator - load_attrs ::= LOAD_ATTR+ - # Python 2.5+ omits POP_TOP POP_BLOCK while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_TOP POP_BLOCK COME_FROM while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK COME_FROM @@ -58,6 +55,10 @@ class Python24Parser(Python25Parser): def add_custom_rules(self, tokens, customize): self.remove_rules(""" kvlist ::= kvlist kv3 + while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM + while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM + while1stmt ::= SETUP_LOOP return_stmts COME_FROM + whilestmt ::= SETUP_LOOP testexpr return_stmts POP_BLOCK COME_FROM """) super(Python24Parser, self).add_custom_rules(tokens, customize) if self.version == 2.4: