Magic-Mirror/python-uncompyle6
1
0
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2024-11-27 07:00:42 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

DRY redundant custom rule checking code

Browse Source
This commit is contained in:
rocky 2016-06-20 19:06:45 -04:00
parent 24d4cfb150
commit f215888374
3 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
uncompyle6/parser.py
View File

@ -28,6 +28,17 @@ nop_func = lambda self, args: None
class PythonParser(GenericASTBuilder):
def add_unique_rule(self, rule, opname, count, customize):
"""Add rule to grammar, but only if it hasn't been added previously
"""
if rule not in self.new_rules:
# print("XXX ", rule) # debug
self.new_rules.add(rule)
self.addRule(rule, nop_func)
customize[opname] = count
pass
return
def cleanup(self):
"""
Remove recursive references to allow garbage

25
uncompyle6/parsers/parse2.py
View File

@ -22,11 +22,7 @@ class Python2Parser(PythonParser):
def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG):
super(Python2Parser, self).__init__(AST, 'stmts', debug=debug_parser)
self.customized = {}
# FIXME: redo with parse3's add_unique_rule.
self.seen32 = False
self.seen1024 = False
self.new_rules = set()
def p_list_comprehension2(self, args):
"""
@ -328,30 +324,27 @@ class Python2Parser(PythonParser):
expr ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP
'''
for k, v in list(customize.items()):
# avoid adding the same rule twice to this parser
if k in self.customized:
continue
self.customized[k] = None
op = k[:k.rfind('_')]
if op in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
thousands = (v//1024)
thirty32s = ((v//32)%32)
if thirty32s > 0 and not self.seen32:
if thirty32s > 0:
rule = "expr32 ::=%s" % (' expr' * 32)
self.addRule(rule, nop_func)
self.add_unique_rule(rule, op, v, customize)
self.seen32 = True
if thousands > 0 and not self.seen1025:
self.addRule("expr1024 ::=%s" % (' expr32' * 32), nop_func)
if thousands > 0:
self.add_unique_rule("expr1024 ::=%s" % (' expr32' * 32),
op, v, customize)
self.seen1024 = True
rule = ('build_list ::= ' + 'expr1024 '*thousands +
'expr32 '*thirty32s + 'expr '*(v%32) + k)
elif op == 'BUILD_MAP':
kvlist_n = "kvlist_%s" % v
rule = kvlist_n + ' ::= ' + ' kv3' * v
self.addRule(rule, nop_func)
self.add_unique_rule(rule, op, v, customize)
rule = "mapexpr ::= %s %s" % (k, kvlist_n)
self.addRule(rule, nop_func)
self.add_unique_rule(rule, op, v, customize)
elif op in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'):
rule = 'unpack ::= ' + k + ' designator'*v
elif op == 'UNPACK_LIST':
@ -385,7 +378,7 @@ class Python2Parser(PythonParser):
+ 'expr ' * nak + k
else:
raise Exception('unknown customize token %s' % k)
self.addRule(rule, nop_func)
self.add_unique_rule(rule, op, v, customize)
class Python2ParserSingle(Python2Parser, PythonParserSingle):
pass

13
uncompyle6/parsers/parse3.py
View File

@ -17,7 +17,7 @@ that a later phase can tern into a sequence of ASCII text.
from __future__ import print_function
from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
from uncompyle6.parser import PythonParser, PythonParserSingle
from uncompyle6.parsers.astnode import AST
from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
from uncompyle6 import PYTHON3
@ -32,17 +32,6 @@ class Python3Parser(PythonParser):
super(Python3Parser, self).__init__(AST, 'stmts', debug=debug_parser)
self.new_rules = set()
def add_unique_rule(self, rule, opname, count, customize):
"""Add rule to grammar, but only if it hasn't been added previously
"""
if rule not in self.new_rules:
# print("XXX ", rule) # debug
self.new_rules.add(rule)
self.addRule(rule, nop_func)
customize[opname] = count
pass
return
def p_list_comprehension3(self, args):
"""
# Python3 scanner adds LOAD_LISTCOMP. Python3 does list comprehension like