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

Merge from 3.0

Browse Source
This commit is contained in:
rocky
2024-07-15 10:22:42 -04:00
parent 1df2ebfbdf
commit d26a8163c0
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uncompyle6/parsers/parse16.py
View File

@@ -38,7 +38,7 @@ class Python16ParserSingle(Python16Parser, PythonParserSingle):
if __name__ == '__main__': if __name__ == '__main__':
# Check grammar # Check grammar
p = Python15Parser() p = Python16Parser()
p.check_grammar() p.check_grammar()
p.dump_grammar() p.dump_grammar()

2
uncompyle6/parsers/parse37base.py
View File

@@ -138,7 +138,7 @@ class Python37BaseParser(PythonParser):
# Note: BUILD_TUPLE_UNPACK_WITH_CALL gets considered by # Note: BUILD_TUPLE_UNPACK_WITH_CALL gets considered by
# default because it starts with BUILD. So we'll set to ignore it from # default because it starts with BUILD. So we'll set to ignore it from
# the start. # the start.
custom_ops_processed = {"BUILD_TUPLE_UNPACK_WITH_CALL"} custom_ops_processed = set(["BUILD_TUPLE_UNPACK_WITH_CALL"])
# A set of instruction operation names that exist in the token stream. # A set of instruction operation names that exist in the token stream.
# We use this customize the grammar that we create. # We use this customize the grammar that we create.

4
uncompyle6/scanners/scanner26.py
View File

@@ -22,6 +22,8 @@ other versions of Python. Also, we save token information for later
use in deparsing. use in deparsing.
""" """
from copy import copy
# bytecode verification, verify(), uses jump_ops from here # bytecode verification, verify(), uses jump_ops from here
from xdis import iscode from xdis import iscode
from xdis.bytecode import _get_const_info from xdis.bytecode import _get_const_info
@@ -350,7 +352,7 @@ class Scanner26(Scanner2):
if show_asm in ("both", "after"): if show_asm in ("both", "after"):
print("\n# ---- tokenization:") print("\n# ---- tokenization:")
# FIXME: t.format() is changing tokens! # FIXME: t.format() is changing tokens!
for t in tokens.copy(): for t in copy(tokens):
print(t.format(line_prefix="")) print(t.format(line_prefix=""))
print() print()
return tokens, customize return tokens, customize

14
uncompyle6/scanners/scanner3.py
View File

@@ -33,6 +33,7 @@ For example:
Finally we save token information. Finally we save token information.
""" """
from copy import deepcopy
import xdis import xdis
# Get all the opcodes into globals # Get all the opcodes into globals
@@ -285,7 +286,7 @@ class Scanner3(Scanner):
) )
return new_tokens return new_tokens
def bound_map_from_inst(self, insts, next_tokens, t, i): def bound_map_from_inst_35(self, insts, next_tokens, t, i):
""" """
Try to a sequence of instruction that ends with a BUILD_MAP into Try to a sequence of instruction that ends with a BUILD_MAP into
a sequence that can be parsed much faster, but inserting the a sequence that can be parsed much faster, but inserting the
@@ -609,11 +610,10 @@ class Scanner3(Scanner):
continue continue
elif opname in ("BUILD_MAP",): elif opname in ("BUILD_MAP",):
bound_map_from_insts_fn = ( if self.version >= (3, 5):
self.bound_map_from_inst_35 bound_map_from_insts_fn = self.bound_map_from_inst_35
if self.version >= (3, 5) else:
else self.bound_map_from_inst_pre35 bound_map_from_insts_fn = self.bound_map_from_inst_pre35
)
try_tokens = bound_map_from_insts_fn( try_tokens = bound_map_from_insts_fn(
self.insts, self.insts,
new_tokens, new_tokens,
@@ -898,7 +898,7 @@ class Scanner3(Scanner):
if show_asm in ("both", "after"): if show_asm in ("both", "after"):
print("\n# ---- tokenization:") print("\n# ---- tokenization:")
# FIXME: t.format() is changing tokens! # FIXME: t.format() is changing tokens!
for t in new_tokens.copy(): for t in deepcopy(new_tokens):
print(t.format(line_prefix="")) print(t.format(line_prefix=""))
print() print()
return new_tokens, customize return new_tokens, customize