You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-04 01:09:52 +08:00
Merge branch 'master' into python-3.3-to-3.5
This commit is contained in:
@@ -215,7 +215,7 @@ class Scanner3(Scanner):
|
|||||||
collection_type: str,
|
collection_type: str,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Try to a replace sequence of instruction that ends with a
|
Try to replace a sequence of instruction that ends with a
|
||||||
BUILD_xxx with a sequence that can be parsed much faster, but
|
BUILD_xxx with a sequence that can be parsed much faster, but
|
||||||
inserting the token boundary at the beginning of the sequence.
|
inserting the token boundary at the beginning of the sequence.
|
||||||
"""
|
"""
|
||||||
@@ -297,8 +297,9 @@ class Scanner3(Scanner):
|
|||||||
)
|
)
|
||||||
return new_tokens
|
return new_tokens
|
||||||
|
|
||||||
# FIXME: consider moving to scanner35
|
def bound_map_from_inst_35(
|
||||||
def bound_map_from_inst_35(self, insts: list, next_tokens: list, t: Token, i: int):
|
self, insts: list, next_tokens: list, t: Token, i: int
|
||||||
|
) -> Optional[list]:
|
||||||
"""
|
"""
|
||||||
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
|
||||||
@@ -423,7 +424,7 @@ class Scanner3(Scanner):
|
|||||||
opname="COLLECTION_START",
|
opname="COLLECTION_START",
|
||||||
attr=collection_enum,
|
attr=collection_enum,
|
||||||
pattr="CONST_MAP",
|
pattr="CONST_MAP",
|
||||||
offset="%s_0" % start_offset,
|
offset=f"{start_offset}_0",
|
||||||
linestart=insts[i].starts_line,
|
linestart=insts[i].starts_line,
|
||||||
has_arg=True,
|
has_arg=True,
|
||||||
has_extended_arg=False,
|
has_extended_arg=False,
|
||||||
@@ -618,6 +619,7 @@ class Scanner3(Scanner):
|
|||||||
if try_tokens is not None:
|
if try_tokens is not None:
|
||||||
new_tokens = try_tokens
|
new_tokens = try_tokens
|
||||||
continue
|
continue
|
||||||
|
|
||||||
elif opname in ("BUILD_MAP",):
|
elif opname in ("BUILD_MAP",):
|
||||||
bound_map_from_insts_fn = (
|
bound_map_from_insts_fn = (
|
||||||
self.bound_map_from_inst_35
|
self.bound_map_from_inst_35
|
||||||
|
Reference in New Issue
Block a user