Bug fix for corner case using -i

Author: marler8997

src/dmd/dmodule.d

@@ -31,6 +31,7 @@ import dmd.globals;
 import dmd.id;
 import dmd.identifier;
 import dmd.parse;
+import dmd.root.array;
 import dmd.root.file;
 import dmd.root.filename;
 import dmd.root.outbuffer;
@@ -536,6 +537,10 @@ extern (C++) final class Module : Package
         }
         m = m.parse();
 
+        // verify the module name matches the imported module name
+        if (!packages.equals((m.md is null) ? null : m.md.packages))
+            m.error(loc, "from file %s must be imported with 'import %s;'", m.srcfile, m.toPrettyChars());
+
         // Call onImport here because if the module is going to be compiled then we
         // need to determine it early because it affects semantic analysis. This is
         // being done after parsing the module so the full module name can be taken

src/dmd/root/array.d

@@ -313,3 +313,15 @@ unittest
     array[2] = 910;
     assert([123, 421, 910, 123, 1, 2, 8, 20, 4, 3] == array.asDArray);
 }
+
+bool equals(T)(const(Array!T)* left, const(Array!T)* right)
+{
+    if (left is null || left.dim == 0)
+        return right is null || right.dim == 0;
+    if (right is null || left.dim != right.dim)
+        return false;
+    foreach (i; 0 .. left.dim)
+        if ((*left)[i] != (*right)[i])
+            return false;
+    return true;
+}

test/fail_compilation/badimport.d

@@ -0,0 +1,4 @@
+// COMPILED_IMPORTS: imports/nomodname.d
+// REQUIRED_ARGS: -Ifail_compilation
+// PERMUTE_ARGS:
+import imports.nomodname;

test/fail_compilation/badimport2.d

@@ -0,0 +1,4 @@
+// COMPILED_IMPORTS: imports/incompletemodname.d
+// REQUIRED_ARGS: -Ifail_compilation
+// PERMUTE_ARGS:
+import imports.incompletemodname;

test/fail_compilation/badimport3.d

@@ -0,0 +1,4 @@
+// COMPILED_IMPORTS: imports/incompletemodname.d
+// REQUIRED_ARGS: -Ifail_compilation
+// PERMUTE_ARGS:
+import imports.wrongpkgname;

test/fail_compilation/ice11919.d

@@ -2,8 +2,8 @@
 TEST_OUTPUT:
 ---
 fail_compilation/ice11919.d(17): Error: cannot interpret `foo` at compile time
-fail_compilation/imports/a11919.d(4): Error: template instance a11919.doBar!(Foo).doBar.zoo!(t) error instantiating
-fail_compilation/imports/a11919.d(11):        instantiated from here: `doBar!(Foo)`
+fail_compilation/imports/a11919.d(5): Error: template instance imports.a11919.doBar!(Foo).doBar.zoo!(t) error instantiating
+fail_compilation/imports/a11919.d(12):        instantiated from here: `doBar!(Foo)`
 fail_compilation/ice11919.d(25):        instantiated from here: `doBar!(Bar)`
 ---
 */

test/fail_compilation/imports/a11919.d

@@ -1,3 +1,4 @@
+module imports.a11919;
 void doBar(T)(T t)
 {
     static if (t.tupleof.length)

test/fail_compilation/imports/incompletemodname.d

@@ -0,0 +1,3 @@
+// The point of this module is that it should be called imports.incompletemodname
+// but it omits the "imports" in it's name.
+module incompletemodname;

test/fail_compilation/imports/nomodname.d

@@ -0,0 +1 @@
+// the point of this module is that it has no module name

test/fail_compilation/imports/wrongpkgname.d

@@ -0,0 +1 @@
+module wrongpkg.wrongpkgname;