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 code clean up

Browse Source
This commit is contained in:
rocky
2016-07-27 06:01:49 -04:00
parent 74f440bd0b
commit 6dc9d3ab2f
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
uncompyle6/parsers/parse2.py
View File

@@ -331,25 +331,31 @@ class Python2Parser(PythonParser):
elif opname_base == 'UNPACK_LIST': elif opname_base == 'UNPACK_LIST':
rule = 'unpack_list ::= ' + opname + ' designator'*v rule = 'unpack_list ::= ' + opname + ' designator'*v
elif opname_base in ('DUP_TOPX', 'RAISE_VARARGS'): elif opname_base in ('DUP_TOPX', 'RAISE_VARARGS'):
# no need to add a rule # FIXME: remove these conditions if they are not needed.
# no longer need to add a rule
continue continue
# rule = 'dup_topx ::= ' + 'expr '*v + opname
elif opname_base == 'MAKE_FUNCTION': elif opname_base == 'MAKE_FUNCTION':
self.addRule('mklambda ::= %s LOAD_LAMBDA %s' % self.addRule('mklambda ::= %s LOAD_LAMBDA %s' %
('pos_arg '*v, opname), nop_func) ('pos_arg '*v, opname), nop_func)
rule = 'mkfunc ::= %s LOAD_CONST %s' % ('expr '*v, opname) rule = 'mkfunc ::= %s LOAD_CONST %s' % ('expr '*v, opname)
elif opname_base == 'MAKE_CLOSURE': elif opname_base == 'MAKE_CLOSURE':
# FIXME: use add_unique_rules to tidy this up. # FIXME: use add_unique_rules to tidy this up.
self.addRule('mklambda ::= %s load_closure LOAD_LAMBDA %s' % self.add_unique_rules([
('expr '*v, opname), nop_func) ('mklambda ::= %s load_closure LOAD_LAMBDA %s' %
self.addRule('genexpr ::= %s load_closure LOAD_GENEXPR %s expr GET_ITER CALL_FUNCTION_1' % ('expr '*v, opname)),
('expr '*v, opname), nop_func) ('genexpr ::= %s load_closure LOAD_GENEXPR %s expr'
self.addRule('setcomp ::= %s load_closure LOAD_SETCOMP %s expr GET_ITER CALL_FUNCTION_1' % ' GET_ITER CALL_FUNCTION_1' %
('expr '*v, opname), nop_func) ('expr '*v, opname)),
self.addRule('dictcomp ::= %s load_closure LOAD_DICTCOMP %s expr GET_ITER CALL_FUNCTION_1' % ('setcomp ::= %s load_closure LOAD_SETCOMP %s expr'
('expr '*v, opname), nop_func) ' GET_ITER CALL_FUNCTION_1' %
rule = 'mkfunc ::= %s load_closure LOAD_CONST %s' % ('expr '*v, opname) ('expr '*v, opname)),
# rule = 'mkfunc ::= %s closure_list LOAD_CONST %s' % ('expr '*v, opname) ('dictcomp ::= %s load_closure LOAD_DICTCOMP %s expr'
' GET_ITER CALL_FUNCTION_1' %
('expr '*v, opname)),
('mkfunc ::= %s load_closure LOAD_CONST %s' %
('expr '*v, opname))],
customize)
continue
elif opname_base in ('CALL_FUNCTION', 'CALL_FUNCTION_VAR', elif opname_base in ('CALL_FUNCTION', 'CALL_FUNCTION_VAR',
'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'): 'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'):
args_pos = (v & 0xff) # positional parameters args_pos = (v & 0xff) # positional parameters

1
uncompyle6/semantics/pysource.py
View File

@@ -246,7 +246,6 @@ TABLE_DIRECT = {
'assign': ( '%|%c = %p\n', -1, (0, 200) ), 'assign': ( '%|%c = %p\n', -1, (0, 200) ),
'augassign1': ( '%|%c %c %c\n', 0, 2, 1), 'augassign1': ( '%|%c %c %c\n', 0, 2, 1),
'augassign2': ( '%|%c.%[2]{pattr} %c %c\n', 0, -3, -4), 'augassign2': ( '%|%c.%[2]{pattr} %c %c\n', 0, -3, -4),
# 'dup_topx': ( '%c', 0),
'designList': ( '%c = %c', 0, -1 ), 'designList': ( '%c = %c', 0, -1 ),
'and': ( '%c and %c', 0, 2 ), 'and': ( '%c and %c', 0, 2 ),
'ret_and': ( '%c and %c', 0, 2 ), 'ret_and': ( '%c and %c', 0, 2 ),