better redefine error messages; move another wip test

12 files changed, 39 insertions, 13 deletions

diff --git a/src/LambdaCube/Compiler/Infer.hs b/src/LambdaCube/Compiler/Infer.hs
index 82ed66f6..d97c66cb 100644
--- a/src/LambdaCube/Compiler/Infer.hs
+++ b/src/LambdaCube/Compiler/Infer.hs
@@ -1312,7 +1312,7 @@ addToEnv exs (si, s) (x, t) = do
     v <- gets $ Map.lookup s
     case v of
       Nothing -> modify $ Map.insert s (closedExp x, closedExp t, si)
-      Just (_, _, si) -> getGEnv exs $ \ge -> throwError $ "already defined " ++ s ++ " at " ++ showSI ge si
+      Just (_, _, si') -> getGEnv exs $ \ge -> throwError $ "already defined " ++ s ++ " at " ++ showSI ge si ++ "\n and at " ++ showSI ge si'
 
 -- Ambiguous: (Int ~ F a) => Int
 -- Not ambiguous: (Show a, a ~ F b) => b
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 6f8e3489..4be74985 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -1,3 +1,6 @@
-already defined thr3 at "testdata/language-features/adt/adt02.reject.lc" (line 5, column 13):
+already defined thr3 at "testdata/language-features/adt/adt02.reject.lc" (line 10, column 9):
+      , thr3 :: Int
+        ^^^^
+ and at "testdata/language-features/adt/adt02.reject.lc" (line 5, column 13):
           , thr3 :: Bool
             ^^^^
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt04.wip.reject.lc b/testdata/language-features/adt/gadt04.reject.lc
index 97fb734e..0290da53 100644
--- a/testdata/language-features/adt/gadt04.wip.reject.lc
+++ b/testdata/language-features/adt/gadt04.reject.lc
@@ -5,4 +5,3 @@ data M :: Type -> String -> Type where
 data M2 :: Type -> String -> Type where
   Value :: a -> forall m . M2 a m
 
--- NOTE: The compiler crashes, instead of compilation error
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
new file mode 100644
index 00000000..d02a455c
--- /dev/null
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -0,0 +1,6 @@
+already defined Value at "testdata/language-features/adt/gadt04.reject.lc" (line 6, column 3):
+  Value :: a -> forall m . M2 a m
+  ^^^^^
+ and at "testdata/language-features/adt/gadt04.reject.lc" (line 3, column 3):
+  Value :: a -> forall m . M a m
+  ^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt04.wip.reject.out b/testdata/language-features/adt/gadt04.wip.reject.out
deleted file mode 100644
index 20d44855..00000000
--- a/testdata/language-features/adt/gadt04.wip.reject.out
+++ /dev/null
@@ -1,3 +0,0 @@
-already defined Value at "testdata/language-features/adt/gadt04.wip.reject.lc" (line 3, column 3):
-  Value :: a -> forall m . M a m
-  ^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index eaa94222..9684e72e 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -1,3 +1,6 @@
-already defined fun at "testdata/language-features/basic-values/def07.reject.lc" (line 1, column 1):
+already defined fun at "testdata/language-features/basic-values/def07.reject.lc" (line 4, column 1):
+fun _ = '_'
+^^^
+ and at "testdata/language-features/basic-values/def07.reject.lc" (line 1, column 1):
 fun 1 = '1'
 ^^^
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/redefine01.reject.out b/testdata/language-features/basic-values/redefine01.reject.out
index f1aa1f4b..d327df62 100644
--- a/testdata/language-features/basic-values/redefine01.reject.out
+++ b/testdata/language-features/basic-values/redefine01.reject.out
@@ -1,3 +1,6 @@
-already defined unit at "testdata/language-features/basic-values/redefine01.reject.lc" (line 1, column 1):
+already defined unit at "testdata/language-features/basic-values/redefine01.reject.lc" (line 3, column 1):
+unit = ()
+^^^^
+ and at "testdata/language-features/basic-values/redefine01.reject.lc" (line 1, column 1):
 unit = ()
 ^^^^
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn03.reject.wip.out b/testdata/language-features/basic-values/typesyn03.reject.wip.out
index 5af3b32d..1603c448 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.wip.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.wip.out
@@ -1,3 +1,6 @@
-already defined 'MyUnit at "testdata/language-features/basic-values/typesyn03.reject.wip.lc" (line 1, column 6):
+already defined 'MyUnit at "testdata/language-features/basic-values/typesyn03.reject.wip.lc" (line 2, column 6):
+type MyUnit = ()
+     ^^^^^^
+ and at "testdata/language-features/basic-values/typesyn03.reject.wip.lc" (line 1, column 6):
 type MyUnit = ()
      ^^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/typesyn04.reject.wip.out b/testdata/language-features/basic-values/typesyn04.reject.wip.out
index 62d05d81..249d56b1 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.wip.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.wip.out
@@ -1,3 +1,6 @@
-already defined 'MyUnit at "testdata/language-features/basic-values/typesyn04.reject.wip.lc" (line 1, column 6):
+already defined 'MyUnit at "testdata/language-features/basic-values/typesyn04.reject.wip.lc" (line 2, column 6):
+type MyUnit = ()
+     ^^^^^^
+ and at "testdata/language-features/basic-values/typesyn04.reject.wip.lc" (line 1, column 6):
 type MyUnit = ()
      ^^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/module/import04.reject.wip.out b/testdata/language-features/module/import04.reject.wip.out
index 62aa6e38..fbe94452 100644
--- a/testdata/language-features/module/import04.reject.wip.out
+++ b/testdata/language-features/module/import04.reject.wip.out
@@ -1,3 +1,6 @@
-already defined hello at "testdata/language-features/module/Hello01.lc" (line 3, column 1):
+already defined hello at "testdata/language-features/module/import04.reject.wip.lc" (line 4, column 1):
+hello = "hello"
+^^^^^
+ and at "testdata/language-features/module/Hello01.lc" (line 3, column 1):
 -- redefine hello
 ^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/module/import10.reject.wip.out b/testdata/language-features/module/import10.reject.wip.out
index a1fb7551..b05b6201 100644
--- a/testdata/language-features/module/import10.reject.wip.out
+++ b/testdata/language-features/module/import10.reject.wip.out
@@ -1,3 +1,6 @@
-already defined 'MyUnit at "testdata/language-features/module/TypeSyn01.lc" (line 2, column 6):
+already defined 'MyUnit at "testdata/language-features/module/import10.reject.wip.lc" (line 3, column 6):
+type MyUnit = ()
+     ^^^^^^
+ and at "testdata/language-features/module/TypeSyn01.lc" (line 2, column 6):
 
      ^^^^^^
\ No newline at end of file
diff --git a/testdata/language-features/module/import11.reject.wip.out b/testdata/language-features/module/import11.reject.wip.out
index a1fb7551..efa5bd07 100644
--- a/testdata/language-features/module/import11.reject.wip.out
+++ b/testdata/language-features/module/import11.reject.wip.out
@@ -1,3 +1,6 @@
-already defined 'MyUnit at "testdata/language-features/module/TypeSyn01.lc" (line 2, column 6):
+already defined 'MyUnit at "testdata/language-features/module/import11.reject.wip.lc" (line 3, column 6):
+type MyUnit = ()
+     ^^^^^^
+ and at "testdata/language-features/module/TypeSyn01.lc" (line 2, column 6):
 
      ^^^^^^
\ No newline at end of file