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

Small fixes in fragment parser

Browse Source
This commit is contained in:
rocky
2020-04-21 19:58:03 -04:00
parent 5bd97aa756
commit ab6b12be56
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uncompyle6/parser.py
View File

@@ -30,7 +30,7 @@ from uncompyle6.show import maybe_show_asm
class ParserError(Exception): class ParserError(Exception):
def __init__(self, token, offset, debug): def __init__(self, token, offset, debug=PARSER_DEFAULT_DEBUG):
self.token = token self.token = token
self.offset = offset self.offset = offset
self.debug = debug self.debug = debug

22
uncompyle6/parsers/parse37base.py
View File

@@ -5,6 +5,7 @@ Python 3.7 base code. We keep non-custom-generated grammar rules out of this fil
from uncompyle6.parser import ParserError, PythonParser, nop_func from uncompyle6.parser import ParserError, PythonParser, nop_func
from uncompyle6.parsers.treenode import SyntaxTree from uncompyle6.parsers.treenode import SyntaxTree
from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
from spark_parser.spark import rule2str
from uncompyle6.parsers.reducecheck import ( from uncompyle6.parsers.reducecheck import (
and_check, and_check,
@@ -1181,18 +1182,27 @@ class Python37BaseParser(PythonParser):
def reduce_is_invalid(self, rule, ast, tokens, first, last): def reduce_is_invalid(self, rule, ast, tokens, first, last):
lhs = rule[0] lhs = rule[0]
n = len(tokens) n = len(tokens)
last = min(last, n-1) last = min(last, n - 1)
fn = self.reduce_check_table.get(lhs, None) fn = self.reduce_check_table.get(lhs, None)
try: try:
if fn: if fn:
return fn(self, lhs, n, rule, ast, tokens, first, last) return fn(self, lhs, n, rule, ast, tokens, first, last)
except: except:
import sys, traceback import sys, traceback
print("Exception in %s %s\n" +
"rule: %s\n" + print(
"offsets %s .. %s" % ("Exception in %s %s\n"
(fn.__name__, sys.exc_info()[1], rule, tokens[first].offset, tokens[last].offset)) + "rule: %s\n"
print(traceback.print_tb(sys.exc_info()[2],-1)) + "offsets %s .. %s")
% (
fn.__name__,
sys.exc_info()[1],
rule2str(rule),
tokens[first].offset,
tokens[last].offset,
)
)
print(traceback.print_tb(sys.exc_info()[2], -1))
raise ParserError(tokens[last], tokens[last].off2int(), self.debug["rules"]) raise ParserError(tokens[last], tokens[last].off2int(), self.debug["rules"])
if lhs in ("aug_assign1", "aug_assign2") and ast[0][0] == "and": if lhs in ("aug_assign1", "aug_assign2") and ast[0][0] == "and":

4
uncompyle6/semantics/fragments.py
View File

@@ -1163,6 +1163,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
# modularity is broken here # modularity is broken here
p_insts = self.p.insts p_insts = self.p.insts
self.p.insts = self.scanner.insts self.p.insts = self.scanner.insts
self.p.offset2inst_index = self.scanner.offset2inst_index
ast = python_parser.parse(self.p, tokens, customize) ast = python_parser.parse(self.p, tokens, customize)
self.p.insts = p_insts self.p.insts = p_insts
except (python_parser.ParserError, AssertionError) as e: except (python_parser.ParserError, AssertionError) as e:
@@ -1200,10 +1201,11 @@ class FragmentsWalker(pysource.SourceWalker, object):
# modularity is broken here # modularity is broken here
p_insts = self.p.insts p_insts = self.p.insts
self.p.insts = self.scanner.insts self.p.insts = self.scanner.insts
self.p.offset2inst_index = self.scanner.offset2inst_index
ast = parser.parse(self.p, tokens, customize) ast = parser.parse(self.p, tokens, customize)
self.p.insts = p_insts self.p.insts = p_insts
except (parser.ParserError, AssertionError) as e: except (parser.ParserError, AssertionError) as e:
raise ParserError(e, tokens) raise ParserError(e, tokens, {})
maybe_show_tree(self, ast) maybe_show_tree(self, ast)