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

Python 2.5 "with"; Isolate 2.5-2.6 grammar better

Browse Source
This commit is contained in:
rocky
2017-11-16 09:26:23 -05:00
parent 953cf312db
commit 53beae8ee6
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.6/05_with.pyc
View File

Binary file not shown.

4
test/simple_source/stmts/05_with.py
View File

@@ -1,3 +1,5 @@
from __future__ import with_statement from __future__ import with_statement
with (sys) as f: with open(__file__, 'r') as f:
print(f) print(f)
with f:
pass

13
uncompyle6/parsers/parse25.py
View File

@@ -21,8 +21,13 @@ class Python25Parser(Python26Parser):
# Python 2.6 uses ROT_TWO instead of the STORE_xxx # Python 2.6 uses ROT_TWO instead of the STORE_xxx
# withas is allowed as a "from future" in 2.5 # withas is allowed as a "from future" in 2.5
# 2.6 and 2.7 do something slightly different
setupwithas ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0 setupwithas ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0
setup_finally setup_finally
# opcode SETUP_WITH
setupwith ::= DUP_TOP LOAD_ATTR STORE_NAME LOAD_ATTR CALL_FUNCTION_0 POP_TOP
withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM with_cleanup
store ::= STORE_FAST store ::= STORE_FAST
store ::= STORE_NAME store ::= STORE_NAME
@@ -41,6 +46,14 @@ class Python25Parser(Python26Parser):
""" """
def add_custom_rules(self, tokens, customize): def add_custom_rules(self, tokens, customize):
# grammar rules inherited from Python 2.6
self.remove_rules("""
setupwith ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
withasstmt ::= expr setupwithas designator suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
""")
super(Python25Parser, self).add_custom_rules(tokens, customize) super(Python25Parser, self).add_custom_rules(tokens, customize)
if self.version == 2.5: if self.version == 2.5:
self.check_reduce['tryelsestmt'] = 'tokens' self.check_reduce['tryelsestmt'] = 'tokens'

5
uncompyle6/parsers/parse26.py
View File

@@ -251,6 +251,11 @@ class Python26Parser(Python2Parser):
""" """
def add_custom_rules(self, tokens, customize): def add_custom_rules(self, tokens, customize):
self.remove_rules("""
withasstmt ::= expr SETUP_WITH designator suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM_WITH
WITH_CLEANUP END_FINALLY
""")
super(Python26Parser, self).add_custom_rules(tokens, customize) super(Python26Parser, self).add_custom_rules(tokens, customize)
self.check_reduce['and'] = 'AST' self.check_reduce['and'] = 'AST'