From c787c2790178f867a4b97fcdb5d476b15ef38728 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 10 Dec 2017 17:37:10 -0500 Subject: [PATCH] Get ready for release 2.14.1 --- NEWS | 8 ++++++++ uncompyle6/parsers/parse35.py | 8 ++++---- uncompyle6/version.py | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index a668628b..4d694db5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +uncompyle6 2.14.0 2017-12-10 Dr. Gecko + +- Many decompilation bugfixes +- Grammar rule reduction and version isolation +- Match higher-level nonterminal names more closely + with Python AST +- Start automated Python stdlib testing - full round trip + uncompyle6 2.14.0 2017-11-26 johnnybamazing - Start to isolate grammar rules between versions diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py index 9f49f4cb..5f78c016 100644 --- a/uncompyle6/parsers/parse35.py +++ b/uncompyle6/parsers/parse35.py @@ -153,14 +153,14 @@ class Python35Parser(Python34Parser): nargs = token.attr % 256 map_unpack_n = "map_unpack_%s" % nargs rule = map_unpack_n + ' ::= ' + 'expr ' * (nargs) + print("XXXX", rule) self.addRule(rule, nop_func) rule = "unmapexpr ::= %s %s" % (map_unpack_n, opname) self.addRule(rule, nop_func) call_token = tokens[i+1] - if self.version == 3.5: - rule = 'call ::= expr unmapexpr ' + call_token.kind - self.addRule(rule, nop_func) - pass + rule = 'call ::= expr unmapexpr ' + call_token.kind + print("XXXX2", rule) + self.addRule(rule, nop_func) elif opname == 'BUILD_MAP_UNPACK': self.addRule(""" expr ::= unmap_dict diff --git a/uncompyle6/version.py b/uncompyle6/version.py index 38af4088..f0303236 100644 --- a/uncompyle6/version.py +++ b/uncompyle6/version.py @@ -1,3 +1,3 @@ # This file is suitable for sourcing inside bash as # well as importing into Python -VERSION='2.14.0' +VERSION='2.14.1'