Merge branch 'dict-literals' of https://github.com/BobTheBuidler/mypy into dict-literals

Author: BobTheBuidler

mypyc/codegen/literals.py

@@ -6,7 +6,16 @@
 # Supported Python literal types. All tuple / frozenset / dict items must have supported
 # literal types as well, but we can't represent the type precisely.
 LiteralValue = Union[
-    str, bytes, int, bool, float, complex, tuple[object, ...], frozenset[object], dict[object, object], None
+    str,
+    bytes,
+    int,
+    bool,
+    float,
+    complex,
+    tuple[object, ...],
+    frozenset[object],
+    dict[object, object],
+    None,
 ]
 
 
@@ -124,7 +133,7 @@ def literal_index(self, value: LiteralValue) -> int:
     def make_dict_literal_key(self, value: dict[LiteralValue, LiteralValue]) -> tuple[tuple[LiteralValue, LiteralValue]]:
         """Make a unique key for a literal dict."""
         return tuple(value.items())
-    
+
     def num_literals(self) -> int:
         # The first three are for None, True and False
         return (

mypyc/irbuild/expression.py

@@ -59,11 +59,9 @@
     BasicBlock,
     Call,
     ComparisonOp,
-    InitStatic,
     Integer,
     LoadAddress,
     LoadLiteral,
-    LoadStatic,
     PrimitiveDescription,
     RaiseStandardError,
     Register,
@@ -103,7 +101,12 @@
 )
 from mypyc.irbuild.specialize import apply_function_specialization, apply_method_specialization
 from mypyc.primitives.bytes_ops import bytes_slice_op
-from mypyc.primitives.dict_ops import dict_get_item_op, dict_new_op, dict_set_item_op, dict_template_copy_op, exact_dict_set_item_op
+from mypyc.primitives.dict_ops import (
+    dict_get_item_op,
+    dict_new_op,
+    dict_template_copy_op,
+    exact_dict_set_item_op,
+)
 from mypyc.primitives.generic_ops import iter_op, name_op
 from mypyc.primitives.list_ops import list_append_op, list_extend_op, list_slice_op
 from mypyc.primitives.misc_ops import ellipsis_op, get_module_dict_op, new_slice_op, type_op
@@ -1012,7 +1015,9 @@ def _visit_tuple_display(builder: IRBuilder, expr: TupleExpr) -> Value:
     return builder.primitive_op(list_tuple_op, [val_as_list], expr.line)
 
 
-def dict_literal_values(builder: IRBuilder, items: Sequence[tuple[Expression | None, Expression]], line: int) -> "dict | None":
+def dict_literal_values(
+    builder: IRBuilder, items: Sequence[tuple[Expression | None, Expression]], line: int
+) -> dict | None:
     """Try to extract a constant dict from a dict literal, recursively staticizing nested dicts.
 
     If all keys and values are deeply immutable and constant (including nested dicts as values),
@@ -1043,6 +1048,7 @@ def dict_literal_values(builder: IRBuilder, items: Sequence[tuple[Expression | N
 
     return result or None
 
+
 def transform_dict_expr(builder: IRBuilder, expr: DictExpr) -> Value:
     """First accepts all keys and values, then makes a dict out of them.
 

mypyc/test-data/irbuild-dict.test

@@ -603,4 +603,3 @@ L0:
     r5 = CPyDict_Build(1, r0, r4)
     d = r5
     return 1
-