jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Isolate "and2" rule to 2.3

Browse Source
This commit is contained in:
rocky
2017-11-16 10:47:35 -05:00
parent 53beae8ee6
commit e26de53332
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uncompyle6/parser.py
View File

@@ -465,7 +465,6 @@ class PythonParser(GenericASTBuilder):
expr ::= cmp expr ::= cmp
expr ::= mapexpr expr ::= mapexpr
expr ::= and expr ::= and
expr ::= and2
expr ::= or expr ::= or
expr ::= unary_expr expr ::= unary_expr
expr ::= call_function expr ::= call_function
@@ -510,10 +509,6 @@ class PythonParser(GenericASTBuilder):
_mklambda ::= load_closure mklambda _mklambda ::= load_closure mklambda
_mklambda ::= mklambda _mklambda ::= mklambda
# "and" where the first part of the and is true,
# so there is only the 2nd part to evaluate
and2 ::= _jump jmp_false COME_FROM expr COME_FROM
expr ::= conditional expr ::= conditional
conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
conditional ::= expr jmp_false expr JUMP_ABSOLUTE expr conditional ::= expr jmp_false expr JUMP_ABSOLUTE expr

5
uncompyle6/parsers/parse23.py
View File

@@ -42,6 +42,11 @@ class Python23Parser(Python24Parser):
lc_body ::= LOAD_FAST expr CALL_FUNCTION_1 POP_TOP lc_body ::= LOAD_FAST expr CALL_FUNCTION_1 POP_TOP
lc_body ::= LOAD_NAME expr LIST_APPEND lc_body ::= LOAD_NAME expr LIST_APPEND
lc_body ::= LOAD_FAST expr LIST_APPEND lc_body ::= LOAD_FAST expr LIST_APPEND
# "and" where the first part of the and is true,
# so there is only the 2nd part to evaluate
expr ::= and2
and2 ::= _jump jmp_false COME_FROM expr COME_FROM
''' '''
def add_custom_rules(self, tokens, customize): def add_custom_rules(self, tokens, customize):