Merge pull request #1419 from taimoorzaeem/issue1253

Improve error message for ModuleNameMismatch error and add regression test.
GaloisInc · Aug 29, 2022 · 91c8227 · 91c8227
2 parents bc92cd0 + c003895
commit 91c8227
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 1 deletion.
diff --git a/src/Cryptol/ModuleSystem/Monad.hs b/src/Cryptol/ModuleSystem/Monad.hs
@@ -192,7 +192,7 @@ instance PP ModuleError where
     ModuleNameMismatch expected found ->
       hang (text "[error]" <+> pp (P.srcRange found) <.> char ':')
          4 (vcat [ text "File name does not match module name:"
-                 , text "Saw:"      <+> pp (P.thing found)
+                 , text "  Actual:" <+> pp (P.thing found)
                  , text "Expected:" <+> pp expected
                  ])
 

diff --git a/tests/issues/issue1253.icry b/tests/issues/issue1253.icry
@@ -0,0 +1 @@
+:l issue1253a.cry
diff --git a/tests/issues/issue1253.icry.stdout b/tests/issues/issue1253.icry.stdout
@@ -0,0 +1,8 @@
+Loading module Cryptol
+Loading module Cryptol
+Loading module Foo
+
+[error] ./issue1253b.cry:1:8--1:11:
+    File name does not match module name:
+      Actual: Foo
+    Expected: issue1253b
diff --git a/tests/issues/issue1253.icry.stdout.mingw32 b/tests/issues/issue1253.icry.stdout.mingw32
@@ -0,0 +1,8 @@
+Loading module Cryptol
+Loading module Cryptol
+Loading module Foo
+
+[error] .\issue1253b.cry:1:8--1:11:
+    File name does not match module name:
+      Actual: Foo
+    Expected: issue1253b
diff --git a/tests/issues/issue1253a.cry b/tests/issues/issue1253a.cry
@@ -0,0 +1,4 @@
+module issue1253a where
+
+import issue1253b
+
diff --git a/tests/issues/issue1253b.cry b/tests/issues/issue1253b.cry
@@ -0,0 +1,2 @@
+module Foo where
+