From 5b3ea47bacab1cb5caec5cdf59fa92ab39574db4 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 16 Oct 2022 19:33:51 -0400
Subject: [PATCH] Correct long-literals for Python 2.7

---
 test/bytecode_2.7_run/05_long_literals.pyc    | Bin 20487 -> 20615 bytes
 test/bytecode_3.7_run/05_long_literals.pyc    | Bin 12723 -> 12788 bytes
 .../expression/05_long_literals.py            |  13 ++++++++++---
 uncompyle6/parser.py                          |   2 +-
 uncompyle6/parsers/parse2.py                  |   4 +++-
 uncompyle6/scanner.py                         |   6 +++++-
 uncompyle6/semantics/make_function36.py       |   1 -
 uncompyle6/semantics/n_actions.py             |  11 +++++++----
 8 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/bytecode_2.7_run/05_long_literals.pyc b/test/bytecode_2.7_run/05_long_literals.pyc
index f2e2a5bd7aeb19c7725e9591e22c763877bc8709..d5d998e6eb4b06307ca8b7a51e186e100a407287 100644
GIT binary patch
delta 3992
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
X^~_a!Iv$M`Nsg3?HjNf+>e}uvkLzi{

delta 3864
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

diff --git a/test/bytecode_3.7_run/05_long_literals.pyc b/test/bytecode_3.7_run/05_long_literals.pyc
index 466bb751ca4f0b4f0e4b98ad53759d1ef25b8993..f0ab39de15ac3902e26217ffbcf673f28577ed48 100644
GIT binary patch
delta 209
zcmdm-{3V&siI<m)0SNM@_$2T2n8+u=7_(9RJ+I0H#*|+`{5yv^iaC`ziv`I3lg%)J
zuZSa$A(b(OL7X9lak2r2od8hc?;OP_CXnJ_291B4bNI|;g<gWp^wVT2Vg}MhT8s<~
zlNV_(SJz~{#aMBRG4U2#Sz=CUYVj@R;>zM%>}9D%#hLkeD;bImfGUd&CMWASa0sz7
zFtD(4@l4*RV={Ta4%_6XI&+yhxY##O)P2V|dA=^s=6d~)jO@%jjC@Q?oRbR;odD|)
BJ~RLT

delta 121
zcmey8yg8ZAiI<m)0SLN|rY0?OpU5Y{=&(`!JugQpV+w;fLki<$0}eZZ35+Sf<|sxn
z0qNht3>tqnckr3XPQIYMT*^<A`4(fvEyl!KY-Nc#rK!a$8H#in8Gyv(c{&b^Jd^M1
X++$?hyifNnGZPov<b%5QOkB(W4@4$!

diff --git a/test/simple_source/expression/05_long_literals.py b/test/simple_source/expression/05_long_literals.py
index 9d0a0bf0..74804f09 100644
--- a/test/simple_source/expression/05_long_literals.py
+++ b/test/simple_source/expression/05_long_literals.py
@@ -161,7 +161,9 @@ x = {
     "return": 12,
 }
 
-assert tuple(x.keys()) == ("b", "c", "e", "g", "h", "j", "k", "return")
+# We need sorted here and below, because x.keys() in 2.7 comes out in the reverse order.
+# Go figure.
+assert sorted(x.keys()) == ["b", "c", "e", "g", "h", "j", "k", "return"]
 
 # Ensure that in dictionary we produce integers, not strings
 x = {1: 2, 3: 4}
@@ -675,7 +677,12 @@ values = {
     "value502": 502 + 1,
 }
 
-assert list(values.values())[1:] == list(range(3, 502 + 2))
+import sys
+if sys.version < (3, 0):
+    # Python 2.7 is funky with values.values() ordering
+    assert sorted(values.values())[1:-2] == list(range(4, 502 + 1))
+else:
+    assert list(values.values())[1:] == list(range(3, 502 + 2))
 
 # Try a long dictionary that fails because we have a binary op.
 # We can get a expr32 grouping speedup
@@ -717,4 +724,4 @@ values = {
     "value33": 33,
 }
 
-assert list(values.values())[1:] == list(range(2, 34))
+assert sorted(values.values())[1:] == list(range(2, 34))
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index 4d139b41..016b22de 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -99,7 +99,7 @@ class PythonParser(GenericASTBuilder):
         # so on but that would require major changes to the
         # semantic actions
         self.singleton = frozenset(
-            ("str", "store", "_stmts", "suite_stmts_opt", "inplace_op")
+            ("str", "store", "_stmts", "suite_stmts_opt", "inplace_op", "add_value")
         )
         # Instructions filled in from scanner
         self.insts = []
diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py
index ab035d61..86cf8bd4 100644
--- a/uncompyle6/parsers/parse2.py
+++ b/uncompyle6/parsers/parse2.py
@@ -315,7 +315,9 @@ class Python2Parser(PythonParser):
             if opname in ("BUILD_CONST_LIST", "BUILD_CONST_SET"):
                 rule = (
                     """
-                       add_consts          ::= ADD_VALUE*
+                       add_consts          ::= add_value+
+                       add_value           ::= ADD_VALUE
+                       add_value           ::= ADD_VALUE_VAR
                        const_list          ::= COLLECTION_START add_consts %s
                        expr                ::= const_list
                        """
diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
index 6452dae4..b8e621e7 100644
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@@ -171,10 +171,14 @@ class Scanner(object):
                 has_extended_arg=False,
             )
         )
+        if tokens[j] == "LOAD_CONST":
+            opname = "ADD_VALUE"
+        else:
+            opname = "ADD_VALUE_VAR"
         for j in range(collection_start, i):
             new_tokens.append(
                 Token(
-                    opname="ADD_VALUE",
+                    opname=opname,
                     attr=tokens[j].attr,
                     pattr=tokens[j].pattr,
                     offset=tokens[j].offset,
diff --git a/uncompyle6/semantics/make_function36.py b/uncompyle6/semantics/make_function36.py
index 4c29a936..78bf9e26 100644
--- a/uncompyle6/semantics/make_function36.py
+++ b/uncompyle6/semantics/make_function36.py
@@ -25,7 +25,6 @@ from xdis import (
 )
 from uncompyle6.scanner import Code
 from uncompyle6.semantics.parser_error import ParserError
-from uncompyle6.parser import ParserError as ParserError2
 from uncompyle6.semantics.helper import (
     find_all_globals,
     find_globals_and_nonlocals,
diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py
index f5ab142d..38569a61 100644
--- a/uncompyle6/semantics/n_actions.py
+++ b/uncompyle6/semantics/n_actions.py
@@ -257,11 +257,14 @@ class NonterminalActions:
                 sep = ", "
         else:
             for elem in flat_elems:
-                assert elem.kind == "ADD_VALUE"
-                try:
+                if elem == "add_value":
+                    elem = elem[0]
+                if elem == "ADD_VALUE":
                     value = "%r" % elem.pattr
-                except Exception:
-                    value = elem.pattr
+                else:
+                    assert elem.kind == "ADD_VALUE_VAR"
+                    value = "%s" % elem.pattr
+
                 if elem.linestart is not None:
                     if elem.linestart != self.line_number:
                         next_indent = self.indent + INDENT_PER_LEVEL[:-1]