From 9aba1cc3af5ab64fd26ddd5af94e759087386059 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 30 Apr 2022 14:05:44 -0400
Subject: [PATCH] Bytecode 1.x fixes

---
 test/bytecode_1.0/os.pyc            | Bin 0 -> 2213 bytes
 test/bytecode_1.0/posixpath.pyc     | Bin 0 -> 7784 bytes
 test/bytecode_1.0/stat.pyc          | Bin 0 -> 2665 bytes
 uncompyle6/scanners/scanner26.py    |   5 ++--
 uncompyle6/semantics/customize.py   |  37 +++++++++++++++-------------
 uncompyle6/semantics/customize14.py |  30 ++++++++++++++++++++++
 6 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 test/bytecode_1.0/os.pyc
 create mode 100644 test/bytecode_1.0/posixpath.pyc
 create mode 100644 test/bytecode_1.0/stat.pyc
 create mode 100644 uncompyle6/semantics/customize14.py

diff --git a/test/bytecode_1.0/os.pyc b/test/bytecode_1.0/os.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..99ad52aaa607a367b6b4be8a1ba0865371b5a201
GIT binary patch
literal 2213
zcmb_dTW=dh6#mw?I8H(@X)Bx-x<E@s1-3)EMrqm-f<Oq9s)bZ`MC5qJ@g(b=?T#JU
zimiF!kry8O1NZ~{3;q@7%w`uu-&(55nRDjbv){RWn|tvByAO{Kx6LyTu=M{D`anSd
z!h^`6mq$+Iv6*@biKob(62t=N*I~*pVHUC3qJVGW#6!!2tz!HaB%mlNuqG<(ivK_>
z54#4LhxDKdI4(i|2G3q+EP1Q@d9;dXmC#y%y#cYr-fLnRg`ezO5G!-$+YoQenKvOW
z%$YtWtFZ4tT>Qtm7gk~4MM0KvT!F5@qkr~2ggJQ6>@Dnu9=zuf_U!v;6VW>$q_~8~
z_5+B^__?(R`ys?CohY9M#1%R%!QO+oN~dKI&nN9`01OovHIw7tnltLANJgZM8asR6
z<jEG=IBUZ}H#VGe(CIoe94dmqT%?~~tOx#W<EufW<Dq}IX;#R4ZrwIfXV`ZhKKS<u
z={yy}2pOd2m6rn@$gvul>vR!nUmM><va5Qk>kqUT1=8>7Q7E>}Edo#x&OCHI%zzoS
z_%37)Q()?$m&4jOG)7O_oN@Ea6zESUJ~E2y;H;hsq)Vqkm7VitP*)#0mfchHF#+m*
zJ&^TScTXnuS~QX2Y5i2jM(NPh*K3X1dOc8w^=LBe>#(j3L9zhBw%MQv)T*=G9N&+a
zDGmBkb(Vvz@mM76+2>E)_@8IN44aO7l1fHCW1A$#IATUa4m8@Fbe3y|bS)*2DKVJy
zldqa!8X=J99clc#BkTWjN7DD5Mz75{+BV;_=-k6u1;6Cd8Ty19LS0}TxIsGb>3=e?
zpMl4U_tJjO62-0i0<r*A1W8rT!<xQBmtW$fgc<GZ2Bvwa1%}XlRgi|!aLx({R|&QW
zLC-lYJIaH+_CBcdqRgm$3SY#m1iOXt@0d~qTKFx*zhXve^Z;@hY6a5;X6&MtVIN|0
z750(iUCwr4FZ==aD^i*ZPHDDCX*l{KW+Xax8`DL8?QtIZCfQ$uaO|pZ*m)+LxKpR+
zf08QgU|PhqgvV~xmS~=uiMF@_bQ8Dx=;^oTibB`PIMxqUXv$>OM<#Ygl^@l<8Fl+U
z&$h2)U#M7ihdQ3PEj@D&^hQAtb_P=M)7fYzs^n&W+@(Iy6&n<Q>P`lGWE_WDEv9z^
zbEH^|9FT-T@n~g)=|eykyLOsC?lhk!={U$RR^gH2@YzDS)oZjbr#?;~yUau&*|#K~
zVOqSWF{uZi`yF#|A}8*Z#=XLDHBA(#VNc0Gn2cMpzT<AnJWbUBoX9fyV|`xYv|?!y
zbex_-?H;8{yzVlcMr{^<*P#RYpoBt>U2HQ+cynrwANS6%>K~3&FjV0|qUs0E@3QZX
uV(ObaMjdx_wU&`9$an5*vlGW@8YEwV1GA7(*;9oGqU`wUV!_{v2Y&+{<m0md

literal 0
HcmV?d00001

diff --git a/test/bytecode_1.0/posixpath.pyc b/test/bytecode_1.0/posixpath.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e5961de6f06fb9603f0c8a5dd04d99cb95d8dd16
GIT binary patch
literal 7784
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

literal 0
HcmV?d00001

diff --git a/test/bytecode_1.0/stat.pyc b/test/bytecode_1.0/stat.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..53dcf0ee3826112ca058ad0ca01a57d007ad9f8d
GIT binary patch
literal 2665
zcmcIm+inwA6kT@i+;YE=3o(#zEtx<|m5K@yd`YInb~-bOtrMv(bh~0`i4hYaMQOG9
z4c_|F|KOAQ2kqXIIl~}$BCcdFtux-U&eGa5`#AsZ9d_1VJS#?j=Kz+^FbFV0MnE~3
z9C#FzhslG-Ks_)$;BindOfPr>)CbcCo&@#7^n<5B126;NY0x0dAb18e1TzGl2c5y5
zIRjn<ofUQ#ybL-Aa}InBbROnB_&VqU%mwfb&@jv}_$FusW(0f-Gzv2cz6~0K83Q|@
zaS<8^-vdnun*iSjO$wU?uYsn7O@SYPriD#|AA)9t&44#R7lmB}S3t8cv*1n89LyYe
z3vD6uU>7tGvjF}9v;cDn`~-9fW)Zv%T7)TptDpkRWpFL7xdN`oHCMqqam^C=N6=-M
zWv~aj0&@-QgRa6{2M2LbH^94bbT`3!alE&{jX3$+;AY&5uRu%i_m=^L@<k{uLzq|S
zQRr3ZQ|MP1P#9Dg5-3J<g3^TJJbudIPvHyr11h}kOUwOz)u@I44g<%LO1<n*JKkq?
zUpGpxMc>HEdER;1c3yXW`R&MAd3Dr2c;mcjzmCGrLFC+BSzWp7{2o4YUL74i?;JSM
z;nPDYiqw(ca;x=HIkB^tu~Yb*9sKkE+0m55PNf=zSeKYkQ21Hlt-^@HUkdLvza>a!
z4vup+zg4tz>iO3kX4`qZ$m1kP?MUsD3^m>l8GhK?rcx=n-l?PYMI>>0FXQy<?m8`Q
zb-}5KBu?*VoPOI~r;oRvoIX<#Nt~`_oPO6`r(SvU^iD-2arz+R^!x5Qbu0BRcdGM9
z-Z{S_Dv8yH8LN-FYjwNUh4za`;&db9^l^8bCV5o+dhrxiZK|pgLRKMUf`^bv6hek~
z_*P;M*A?FDa!px5L1r9k`*#FS=1|bm=^Vx5DQLO1x}~M^UKDQ=v})U~<eHT1x+P0D
zg~lU3X!))w+wzUTt)`1=c2SHMnN#6JDIUomjm4y-qJzhBeYGvum&bB_JT2G$C)u1N
zocy3;(iZs{Q9mQ<t7vj_{J5q!WK{jQZ&p>ausjW;Rj$bilV0BonwERzjgsA=;kiNC
z{!nhp`IrcKjplC3cm33MBg2~+F7;^^-ln%>?`>pwGsC4m&C9C?TWNiUH<f?!sjq(?
G9{mSXeNTq~

literal 0
HcmV?d00001

diff --git a/uncompyle6/scanners/scanner26.py b/uncompyle6/scanners/scanner26.py
index 6e040c2e..a1067fbd 100755
--- a/uncompyle6/scanners/scanner26.py
+++ b/uncompyle6/scanners/scanner26.py
@@ -24,7 +24,6 @@ use in deparsing.
 
 import sys
 import uncompyle6.scanners.scanner2 as scan
-from uncompyle6.scanner import L65536
 
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_26
@@ -228,7 +227,9 @@ class Scanner26(scan.Scanner2):
                 elif op in self.opc.JABS_OPS:
                     pattr = repr(oparg)
                 elif op in self.opc.LOCAL_OPS:
-                    if oparg in varnames:
+                    if self.version < (1, 5):
+                        pattr = names[oparg]
+                    else:
                         pattr = varnames[oparg]
                 elif op in self.opc.COMPARE_OPS:
                     pattr = self.opc.cmp_op[oparg]
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index f1f31f95..43942937 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -193,24 +193,27 @@ def customize_for_version(self, is_pypy, version):
                     self.prune()
 
                 self.n_iftrue_stmt24 = n_iftrue_stmt24
-            elif version <= (1, 4):
-                TABLE_DIRECT.update(
-                    {
-                        "call":	(
-                            "%p(%P)",
-                            (0, "expr", 100), (1,-1,", ")
-                        ),
-                        "print_expr_stmt": (
-                            ("%|print %c,\n", 0)
-                        ),
-                    }
-                )
+            elif version < (1, 4):
+                from uncompyle6.semantics.customize14 import customize_for_version14
+                customize_for_version14(self, version)
 
-                # FIXME: figure out how to handle LOAD_FAST
-                # it uses code.names
-                # def n_LOAD_FAST(node):
-                #     pass
-                # self.n_LOAD_FAST = n_LOAD_FAST
+                def n_call(node):
+                    expr = node[0]
+                    assert expr == "expr"
+                    params = node[1]
+                    if params == "tuple":
+                        self.template_engine(("%p(", (0, NO_PARENTHESIS_EVER)), expr)
+                        sep = ""
+                        for param in params[:-1]:
+                            self.write(sep)
+                            self.preorder(param)
+                            sep = ", "
+                        self.write(")")
+                    else:
+                        self.template_engine(("%p(%P)",
+                                              (0, "expr", 100), (1,-1,", ", NO_PARENTHESIS_EVER)), node)
+                    self.prune()
+                self.n_call = n_call
 
             else:  # 1.0 <= version <= 2.3:
                 TABLE_DIRECT.update({"if1_stmt": ("%|if 1\n%+%c%-", 5)})
diff --git a/uncompyle6/semantics/customize14.py b/uncompyle6/semantics/customize14.py
new file mode 100644
index 00000000..3ba53f52
--- /dev/null
+++ b/uncompyle6/semantics/customize14.py
@@ -0,0 +1,30 @@
+#  Copyright (c) 2022 by Rocky Bernstein
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Isolate Python 1.4- version-specific semantic actions here.
+"""
+
+from uncompyle6.semantics.consts import TABLE_DIRECT
+
+#######################
+# Python 1.4- Changes #
+#######################
+def customize_for_version14(self, version):
+    TABLE_DIRECT.update(
+        {
+            "print_expr_stmt": (
+                ("%|print %c\n", 0)
+            ),
+        }
+    )