From 31d387749b1b90d4a324d8018fbae6e6e8365ce6 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 16 Nov 2016 07:28:19 -0500
Subject: [PATCH] More AST checking

Small fixes in output format
---
 test/bytecode_2.6/03_if_vs_and.pyc            | Bin 0 -> 581 bytes
 ...eturn_pop.pyc => 06_return_pop.pyc-notyet} | Bin
 test/simple_source/bug26/03_if_vs_and.py      |  22 ++++++++++++++++++
 uncompyle6/main.py                            |   4 +++-
 uncompyle6/semantics/check_ast.py             |   6 ++---
 uncompyle6/semantics/pysource.py              |   2 +-
 6 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 test/bytecode_2.6/03_if_vs_and.pyc
 rename test/bytecode_2.6/{06_return_pop.pyc => 06_return_pop.pyc-notyet} (100%)
 create mode 100644 test/simple_source/bug26/03_if_vs_and.py

diff --git a/test/bytecode_2.6/03_if_vs_and.pyc b/test/bytecode_2.6/03_if_vs_and.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6d935cafae06c67e69a6d4cc7dd9c6affd0ce5b3
GIT binary patch
literal 581
zcmb7A!AiqG5S`s5wFaY<O7YN}9)gG!1*IS&c<;d;lwLwjR*AIP+TCg@$<4p><ga-0
z=$oXVcr#(%%+9`fGdmxjf&bM%xQ%J`3HVEx2>=Pv8_@`XpkXMHiCsVg=D@CC<{eNF
zr8NqYrKHlOe4h%*b)7`gqa?jUqE2){C|pV$Is@;iL*k|od}P)uSPobAOQ+Is{%TZ-
zE^dEmj93Gb=tQJF5*U2QLg<ftd%N^_M%}8^wGZb}DJWY572~44ivq3+J-la-`anDh
zzzaz^8S;}YLz>yjt9)j89|N7Kke6baytKTiJg(fbcDbrg$~JL_I#gsfL`)T!T|_3G
z&L%1{dNGex?{4vMeA+uYiPHP%*+k<kIh-x+26)j-zo>bn@^M_XH+!rj+QOlh@Wqx4
nfU8&p!V{bLec2F$kmtKz2mG}DU;id*&!;+BOw<KG-N5J@NP}VC

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/06_return_pop.pyc b/test/bytecode_2.6/06_return_pop.pyc-notyet
similarity index 100%
rename from test/bytecode_2.6/06_return_pop.pyc
rename to test/bytecode_2.6/06_return_pop.pyc-notyet
diff --git a/test/simple_source/bug26/03_if_vs_and.py b/test/simple_source/bug26/03_if_vs_and.py
new file mode 100644
index 00000000..5d67dfec
--- /dev/null
+++ b/test/simple_source/bug26/03_if_vs_and.py
@@ -0,0 +1,22 @@
+# From 2.6 decimal
+# Bug was not recognizing scope of if and
+# turning it into xc == 1 and xe *= yc
+def _power_exact(y, xc, yc, xe):
+    yc, ye = y.int, y.exp
+    while yc % 10 == 0:
+        yc //= 10
+        ye += 1
+
+    if xc == 1:
+        xe *= yc
+        while xe % 10 == 0:
+            xe //= 10
+            ye += 1
+        if ye < 0:
+            return None
+        exponent = xe * 10**ye
+        if y and xe:
+            xc = exponent
+        else:
+            xc = 0
+        return 5
diff --git a/uncompyle6/main.py b/uncompyle6/main.py
index 1955fae8..fd2a8d55 100644
--- a/uncompyle6/main.py
+++ b/uncompyle6/main.py
@@ -134,12 +134,14 @@ def main(in_base, out_base, files, codes, outfile=None,
             uncompyle_file(infile, outstream, showasm, showast, showgrammar)
             tot_files += 1
         except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError) as e:
-            sys.stderr.write("\n# file %s\n# %s" % (infile, e))
+            sys.stdout.write("\n")
+            sys.stderr.write("\n# file %s\n# %s\n" % (infile, e))
             failed_files += 1
         except KeyboardInterrupt:
             if outfile:
                 outstream.close()
                 os.remove(outfile)
+            sys.stdout.write("\n")
             sys.stderr.write("\nLast file: %s   " % (infile))
             raise
         # except:
diff --git a/uncompyle6/semantics/check_ast.py b/uncompyle6/semantics/check_ast.py
index 67be0090..8bca0411 100644
--- a/uncompyle6/semantics/check_ast.py
+++ b/uncompyle6/semantics/check_ast.py
@@ -12,9 +12,9 @@ def checker(ast, in_loop, errors):
     in_loop = in_loop or ast.type in ('while1stmt', 'whileTruestmt',
                                       'whilestmt', 'whileelsestmt',
                                       'for_block')
-    if ast.type == 'augassign1' and ast[0][0] == 'and':
-        text = str(ast[0])
-        error_text = '\n# improper augmented assigment:\n#\t' + '\n# '.join(text.split("\n"))
+    if ast.type in ('augassign1', 'augassign2') and ast[0][0] == 'and':
+        text = str(ast)
+        error_text = '\n# improper augmented assigment (e.g. +=, *=, ...):\n#\t' + '\n# '.join(text.split("\n")) + '\n'
         errors.append(error_text)
 
     for node in ast:
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index f7b32fa6..33898b46 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -2324,7 +2324,7 @@ def deparse_code(version, co, out=sys.stdout, showasm=None, showast=False,
         deparsed.write('# global %s ## Warning: Unused global' % g)
 
     if deparsed.ast_errors:
-        deparsed.write("# NOTE: have decompilation errors.\n")
+        deparsed.write("# NOTE: have internal decompilation grammar errors.\n")
         deparsed.write("# Use -t option to show full context.")
         for err in deparsed.ast_errors:
             deparsed.write(err)