Simplify data format

Author: ichard26

mypyc/irbuild/statement.py

@@ -257,19 +257,20 @@ def transform_import(builder: IRBuilder, node: Import) -> None:
             module_static = LoadStatic(object_rprimitive, mod_id, namespace=NAMESPACE_MODULE)
             static_ptr = builder.add(LoadAddress(object_pointer_rprimitive, module_static))
             statics.append(static_ptr)
-            # TODO: Don't add local imports to the global namespace
             # Update the globals dict with the appropriate module:
             # * For 'import foo.bar as baz' we add 'foo.bar' with the name 'baz'
             # * For 'import foo.bar' we add 'foo' with the name 'foo'
             # Typically we then ignore these entries and access things directly
             # via the module static, but we will use the globals version for
             # modules that mypy couldn't find, since it doesn't analyze module
             # references from those properly.
-            if as_name or "." not in mod_id:
-                globals_base = None
+            # TODO: Don't add local imports to the global namespace
+            if as_name:
+                globals_id = mod_id
+                globals_name = as_name
             else:
-                globals_base = mod_id.split(".")[0]
-            modules.append((mod_id, as_name, globals_base))
+                globals_id = globals_name = mod_id.split(".")[0]
+            modules.append((mod_id, globals_id, globals_name))
 
     static_array_ptr = builder.builder.setup_rarray(object_pointer_rprimitive, statics)
     import_line_ptr = builder.builder.setup_rarray(c_pyssize_t_rprimitive, import_lines)
@@ -304,9 +305,9 @@ def transform_import_from(builder: IRBuilder, node: ImportFrom) -> None:
     builder.imports[id] = None
 
     names = [name for name, _ in node.names]
-    as_names = [as_name for _, as_name in node.names]
+    as_names = [as_name or name for name, as_name in node.names]
     names_literal = builder.add(LoadLiteral(tuple(names), object_rprimitive))
-    if all(n is None for n in as_names):
+    if as_names == names:
         # Reuse names tuple to reduce verbosity.
         as_names_literal = names_literal
     else:

mypyc/lib-rt/misc_ops.c

@@ -669,11 +669,8 @@ CPy_Super(PyObject *builtins, PyObject *self) {
     return result;
 }
 
-static bool import_single(PyObject *mod_id,
-                                  PyObject *as_name,
-                                  PyObject **mod_static,
-                                  PyObject *globals_base,
-                                  PyObject *globals) {
+static bool import_single(PyObject *mod_id, PyObject **mod_static,
+                          PyObject *globals_id, PyObject *globals_name, PyObject *globals) {
     if (*mod_static == Py_None) {
         CPyModule *mod = PyImport_Import(mod_id);
         if (mod == NULL) {
@@ -682,16 +679,6 @@ static bool import_single(PyObject *mod_id,
         *mod_static = mod;
     }
 
-    if (as_name == Py_None) {
-        as_name = mod_id;
-    }
-    PyObject *globals_id, *globals_name;
-    if (globals_base == Py_None) {
-        globals_id = mod_id;
-        globals_name = as_name;
-    } else {
-        globals_id = globals_name = globals_base;
-    }
     PyObject *mod_dict = PyImport_GetModuleDict();
     CPyModule *globals_mod = CPyDict_GetItem(mod_dict, globals_id);
     if (globals_mod == NULL) {
@@ -712,10 +699,10 @@ bool CPyImport_ImportMany(PyObject *modules, CPyModule **statics[], PyObject *gl
     for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(modules); i++) {
         PyObject *module = PyTuple_GET_ITEM(modules, i);
         PyObject *mod_id = PyTuple_GET_ITEM(module, 0);
-        PyObject *as_name = PyTuple_GET_ITEM(module, 1);
-        PyObject *globals_base = PyTuple_GET_ITEM(module, 2);
+        PyObject *globals_id = PyTuple_GET_ITEM(module, 1);
+        PyObject *globals_name = PyTuple_GET_ITEM(module, 2);
 
-        if (!import_single(mod_id, as_name, statics[i], globals_base, globals)) {
+        if (!import_single(mod_id, statics[i], globals_id, globals_name, globals)) {
             const char *path = PyUnicode_AsUTF8(tb_path);
             if (path == NULL) {
                 path = "<unable to display>";
@@ -774,9 +761,6 @@ PyObject *CPyImport_ImportFromMany(PyObject *mod_id, PyObject *names, PyObject *
     for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(names); i++) {
         PyObject *name = PyTuple_GET_ITEM(names, i);
         PyObject *as_name = PyTuple_GET_ITEM(as_names, i);
-        if (as_name == Py_None) {
-            as_name = name;
-        }
         PyObject *obj = CPyImport_ImportFrom(mod, mod_id, name, as_name);
         if (obj == NULL) {
             Py_DECREF(mod);

mypyc/test-data/irbuild-basic.test

@@ -745,7 +745,7 @@ L2:
     r10 = load_address r9
     r11 = [1, 2, 3, 4]
     r12 = load_address r11
-    r13 = (('sys', None, None), ('enum', 'enum2', None), ('collections.abc', None, 'collections'), ('collections.abc', 'abc2', None))
+    r13 = (('sys', 'sys', 'sys'), ('enum', 'enum', 'enum2'), ('collections.abc', 'collections', 'collections'), ('collections.abc', 'collections.abc', 'abc2'))
     r14 = __main__.globals :: static
     r15 = 'main'
     r16 = '<module>'
@@ -760,7 +760,7 @@ L2:
     r25 = load_address r24
     r26 = [6]
     r27 = load_address r26
-    r28 = (('single', None, None),)
+    r28 = (('single', 'single', 'single'),)
     r29 = __main__.globals :: static
     r30 = 'main'
     r31 = '<module>'
@@ -3498,7 +3498,7 @@ L0:
     r2 = load_address r1
     r3 = [2]
     r4 = load_address r3
-    r5 = (('p.m', None, 'p'),)
+    r5 = (('p.m', 'p', 'p'),)
     r6 = __main__.globals :: static
     r7 = 'main'
     r8 = 'f'