Merge pull request #451 from andrem-eberle/master

Tentative fix for #439

Author: rocky

test/bytecode_3.8_run/05_long_literals.pyc

@@ -725,3 +725,10 @@
 }
 
 assert sorted(values.values())[1:] == list(range(2, 34))
+
+
+# Check that we can distinguish names from strings in literal collections, e.g. lists.
+# The list has to have more than 4 items to get accumulated in a collection
+a = ["y", 'Exception', "x", Exception, "z"]
+assert a[1] == "Exception"
+assert a[3] == Exception

test/simple_source/expression/05_long_literals.py

@@ -171,11 +171,11 @@ def bound_collection_from_tokens(
                 has_extended_arg=False,
             )
         )
-        if tokens[j] == "LOAD_CONST":
-            opname = "ADD_VALUE"
-        else:
-            opname = "ADD_VALUE_VAR"
         for j in range(collection_start, i):
+            if tokens[j] == "LOAD_CONST":
+                opname = "ADD_VALUE"
+            else:
+                opname = "ADD_VALUE_VAR"
             new_tokens.append(
                 Token(
                     opname=opname,