beta1 updates

Author: P403n1x87

src/bytecode/instr.py

@@ -269,6 +269,13 @@ class CommonConstant(enum.IntEnum):
     BUILTIN_TUPLE = 2
     BUILTIN_ALL = 3
     BUILTIN_ANY = 4
+    BUILTIN_LIST = 5
+    BUILTIN_SET = 6
+    CONSTANT_NONE = 7
+    CONSTANT_EMPTY_STR = 8
+    CONSTANT_TRUE = 9
+    CONSTANT_FALSE = 10
+    CONSTANT_MINUS_ONE = 11
 
 
 # This make type checking happy but means it won't catch attempt to manipulate an unset

tests/test_concrete.py

@@ -244,7 +244,7 @@ def test_eq(self):
     def test_attr(self):
         code_obj = get_code("x = 5")
         code = ConcreteBytecode.from_code(code_obj)
-        self.assertEqual(code.consts, [5, None])
+        self.assertEqual(code.consts, [5] if PY315 else [5, None])
         self.assertEqual(code.names, ["x"])
         self.assertEqual(code.varnames, [])
         self.assertEqual(code.freevars, [])
@@ -256,7 +256,7 @@ def test_attr(self):
                     ConcreteInstr("CACHE", 0, lineno=0),
                     ConcreteInstr("LOAD_SMALL_INT", 5, lineno=1),
                     ConcreteInstr("STORE_NAME", 0, lineno=1),
-                    ConcreteInstr("LOAD_CONST", 1, lineno=1),
+                    ConcreteInstr("LOAD_COMMON_CONSTANT", 7, lineno=1),
                     ConcreteInstr("RETURN_VALUE", lineno=1),
                 ]
                 if PY315
@@ -755,26 +755,30 @@ def foo(x: int, y: int):
         if PY315:
             ann_code = concrete.consts[0]
             func_code = concrete.consts[1]
-            expected_py315 = [
-                ConcreteInstr("RESUME", 0, lineno=0),
-                ConcreteInstr("CACHE", 0, lineno=0),
-                ConcreteInstr("LOAD_CONST", 0, lineno=1),
-                ConcreteInstr("MAKE_FUNCTION", lineno=1),
-                ConcreteInstr("LOAD_CONST", 1, lineno=1),
-                ConcreteInstr("MAKE_FUNCTION", lineno=1),
-                ConcreteInstr("SET_FUNCTION_ATTRIBUTE", 16, lineno=1),
-                ConcreteInstr("STORE_NAME", 0, lineno=1),
-                ConcreteInstr("LOAD_CONST", 2, lineno=1),
-                ConcreteInstr("RETURN_VALUE", lineno=1),
-            ]
+            if PY315:
+                expected_py315 = [
+                    ConcreteInstr("RESUME", 0, lineno=0),
+                    ConcreteInstr("CACHE", 0, lineno=0),
+                    ConcreteInstr("LOAD_CONST", 0, lineno=1),
+                    ConcreteInstr("MAKE_FUNCTION", lineno=1),
+                    ConcreteInstr("LOAD_CONST", 1, lineno=1),
+                    ConcreteInstr("MAKE_FUNCTION", lineno=1),
+                    ConcreteInstr("SET_FUNCTION_ATTRIBUTE", 16, lineno=1),
+                    ConcreteInstr("STORE_NAME", 0, lineno=1),
+                    ConcreteInstr("LOAD_COMMON_CONSTANT", 7, lineno=1),
+                    ConcreteInstr("RETURN_VALUE", lineno=1),
+                ]
+                expected_consts = [ann_code, func_code]
+            else:
+                expected_consts = [ann_code, func_code, None]
             self.assertSequenceEqual(concrete.names, ["foo"])
-            self.assertSequenceEqual(concrete.consts, [ann_code, func_code, None])
+            self.assertSequenceEqual(concrete.consts, expected_consts)
             self.assertInstructionListEqual(list(concrete), expected_py315)
             concrete = ConcreteBytecode.from_code(code_obj, extended_arg=True)
             ann_code = concrete.consts[0]
             func_code = concrete.consts[1]
             self.assertEqual(concrete.names, ["foo"])
-            self.assertEqual(concrete.consts, [ann_code, func_code, None])
+            self.assertEqual(concrete.consts, expected_consts)
             self.assertInstructionListEqual(list(concrete), expected_py315)
             return
         if PY314: