update parsing error messages ; caused by megaparsec upgrade

25 files changed, 33 insertions, 41 deletions

diff --git a/testdata/accumulate01.reject.out b/testdata/accumulate01.reject.out
index d405efed..c882c277 100644
--- a/testdata/accumulate01.reject.out
+++ b/testdata/accumulate01.reject.out
@@ -1,3 +1,2 @@
 ./testdata/accumulate01.reject.lc:3:3:
-expecting expression
-wrong indentation
\ No newline at end of file
+wrong indentation
diff --git a/testdata/empty.reject.out b/testdata/empty.reject.out
index 31491cf6..d1142ce9 100644
--- a/testdata/empty.reject.out
+++ b/testdata/empty.reject.out
@@ -1,3 +1,2 @@
 ./testdata/empty.reject.lc:4:1:
-expecting uppercase ident
-wrong indentation
\ No newline at end of file
+wrong indentation
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index e07abac2..80b3a964 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -1,9 +1,9 @@
 type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
-  <<installed-prelude-path>>/Internals.lc:58:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:58:6:
   data Int
        ^^^
 in proj
@@ -18,11 +18,11 @@ case'Data3
         -> forall (h :: Data3) -> a h
 match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
 !type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
-  <<installed-prelude-path>>/Internals.lc:58:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:58:6:
   data Int
        ^^^
 in proj
diff --git a/testdata/language-features/basic-list/list03.reject.out b/testdata/language-features/basic-list/list03.reject.out
index 4be98b40..e26cab11 100644
--- a/testdata/language-features/basic-list/list03.reject.out
+++ b/testdata/language-features/basic-list/list03.reject.out
@@ -1,3 +1,2 @@
 ./testdata/language-features/basic-list/list03.reject.lc:2:1:
-expecting expression
-wrong indentation
\ No newline at end of file
+wrong indentation
diff --git a/testdata/language-features/basic-list/list04.reject.out b/testdata/language-features/basic-list/list04.reject.out
index b000c562..67166780 100644
--- a/testdata/language-features/basic-list/list04.reject.out
+++ b/testdata/language-features/basic-list/list04.reject.out
@@ -1,3 +1,2 @@
 ./testdata/language-features/basic-list/list04.reject.lc:2:1:
-expecting expression
-wrong indentation
\ No newline at end of file
+wrong indentation
diff --git a/testdata/language-features/basic-list/list05.reject.out b/testdata/language-features/basic-list/list05.reject.out
index 4801e2b7..fb04f4f7 100644
--- a/testdata/language-features/basic-list/list05.reject.out
+++ b/testdata/language-features/basic-list/list05.reject.out
@@ -1,4 +1,2 @@
 ./testdata/language-features/basic-list/list05.reject.lc:2:1:
-unexpected end of input
-expecting expression
-wrong indentation
\ No newline at end of file
+wrong indentation
diff --git a/testdata/language-features/basic-list/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 1b9da45f..133c2522 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -1,5 +1,5 @@
 type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:58:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:58:6:
   data Int
        ^^^
 with
@@ -7,7 +7,7 @@ with
 in []
 ------------ trace
 !type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:58:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:58:6:
   data Int
        ^^^
 with
diff --git a/testdata/language-features/basic-list/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index 64f9f0be..0c382351 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -1,5 +1,5 @@
 type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
@@ -9,7 +9,7 @@ value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
 ------------ trace
 !type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
diff --git a/testdata/language-features/basic-values/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index e004d656..6a0a4fe6 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -1,5 +1,5 @@
 type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
@@ -9,7 +9,7 @@ value1 = if () then () else ()
             ^^
 ------------ trace
 !type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
diff --git a/testdata/language-features/basic-values/indentation03.reject.out b/testdata/language-features/basic-values/indentation03.reject.out
index d7b66dd2..b004c658 100644
--- a/testdata/language-features/basic-values/indentation03.reject.out
+++ b/testdata/language-features/basic-values/indentation03.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/indentation03.reject.lc:2:10:
 unexpected '='
-expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
\ No newline at end of file
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, literal, lowercase ident, swizzling, the rest of expression, or uppercase ident
diff --git a/testdata/language-features/basic-values/indentation04.reject.out b/testdata/language-features/basic-values/indentation04.reject.out
index b310af6c..fd70733a 100644
--- a/testdata/language-features/basic-values/indentation04.reject.out
+++ b/testdata/language-features/basic-values/indentation04.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/indentation04.reject.lc:2:2:
 unexpected 't'
-expecting ''', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, symbols, or uppercase ident
\ No newline at end of file
+expecting end of input or the rest of expression
diff --git a/testdata/language-features/basic-values/infix04.reject.out b/testdata/language-features/basic-values/infix04.reject.out
index c216d697..70884eab 100644
--- a/testdata/language-features/basic-values/infix04.reject.out
+++ b/testdata/language-features/basic-values/infix04.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/infix04.reject.lc:3:14:
 unexpected '`'
-expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, or uppercase ident
\ No newline at end of file
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, literal, lowercase ident, swizzling, the rest of expression, or uppercase ident
diff --git a/testdata/language-features/basic-values/lambda02.reject.out b/testdata/language-features/basic-values/lambda02.reject.out
index 72951b88..a33242d9 100644
--- a/testdata/language-features/basic-values/lambda02.reject.out
+++ b/testdata/language-features/basic-values/lambda02.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/lambda02.reject.lc:1:1:
 unexpected 'f'
-expecting end of input or operator definition
\ No newline at end of file
+expecting end of input
diff --git a/testdata/language-features/basic-values/operator03.reject.out b/testdata/language-features/basic-values/operator03.reject.out
index 062e8901..ff6a2a25 100644
--- a/testdata/language-features/basic-values/operator03.reject.out
+++ b/testdata/language-features/basic-values/operator03.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/operator03.reject.lc:1:1:
 unexpected 'a'
-expecting end of input or operator definition
\ No newline at end of file
+expecting end of input
diff --git a/testdata/language-features/basic-values/operator04.reject.out b/testdata/language-features/basic-values/operator04.reject.out
index 8198712e..8a43bce8 100644
--- a/testdata/language-features/basic-values/operator04.reject.out
+++ b/testdata/language-features/basic-values/operator04.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/operator04.reject.lc:1:1:
 unexpected 'a'
-expecting end of input or operator definition
\ No newline at end of file
+expecting end of input
diff --git a/testdata/language-features/basic-values/redefine02.reject.out b/testdata/language-features/basic-values/redefine02.reject.out
index 2daaf755..cd4e5c30 100644
--- a/testdata/language-features/basic-values/redefine02.reject.out
+++ b/testdata/language-features/basic-values/redefine02.reject.out
@@ -1,9 +1,8 @@
 ./testdata/language-features/basic-values/redefine02.reject.lc:3:8:
-expecting expression
 redefined x:
 ./testdata/language-features/basic-values/redefine02.reject.lc:1:12:
 unit = let x = ()
            ^
 ./testdata/language-features/basic-values/redefine02.reject.lc:2:12:
            x = ()
-           ^
\ No newline at end of file
+           ^
diff --git a/testdata/language-features/basic-values/typesig08.reject.out b/testdata/language-features/basic-values/typesig08.reject.out
index 3b56a757..eca9144b 100644
--- a/testdata/language-features/basic-values/typesig08.reject.out
+++ b/testdata/language-features/basic-values/typesig08.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/typesig08.reject.lc:1:1:
 unexpected 'v'
-expecting end of input or typed ident
\ No newline at end of file
+expecting end of input
diff --git a/testdata/language-features/basic-values/typesig09.reject.out b/testdata/language-features/basic-values/typesig09.reject.out
index 590d00a8..ba4e7d00 100644
--- a/testdata/language-features/basic-values/typesig09.reject.out
+++ b/testdata/language-features/basic-values/typesig09.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/typesig09.reject.lc:1:1:
 unexpected 'v'
-expecting end of input or typed ident
\ No newline at end of file
+expecting end of input
diff --git a/testdata/language-features/basic-values/where02.reject.out b/testdata/language-features/basic-values/where02.reject.out
index b9458151..c7086a64 100644
--- a/testdata/language-features/basic-values/where02.reject.out
+++ b/testdata/language-features/basic-values/where02.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/where02.reject.lc:4:5:
 unexpected '='
-expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
\ No newline at end of file
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, literal, lowercase ident, swizzling, the rest of expression, or uppercase ident
diff --git a/testdata/language-features/basic-values/where03.reject.out b/testdata/language-features/basic-values/where03.reject.out
index acaf1fc0..759ec00b 100644
--- a/testdata/language-features/basic-values/where03.reject.out
+++ b/testdata/language-features/basic-values/where03.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/basic-values/where03.reject.lc:4:2:
 unexpected 'y'
-expecting ''', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, symbols, or uppercase ident
\ No newline at end of file
+expecting end of input or the rest of expression
diff --git a/testdata/language-features/guard/guard05.reject.out b/testdata/language-features/guard/guard05.reject.out
index e424e7d1..ae469f15 100644
--- a/testdata/language-features/guard/guard05.reject.out
+++ b/testdata/language-features/guard/guard05.reject.out
@@ -1,5 +1,5 @@
 type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
@@ -9,7 +9,7 @@ value | () = "wrong"
         ^^
 ------------ trace
 !type error: can not unify
-  <<installed-prelude-path>>/Internals.lc:63:6:
+  /home/csaba/haskell/lambdacube-compiler/.stack-work/install/x86_64-linux/lts-10.4/8.2.2/share/x86_64-linux-ghc-8.2.2/lambdacube-compiler-0.6.1.0/lc/Internals.lc:63:6:
   data Bool = False | True
        ^^^^
 with
diff --git a/testdata/language-features/guard/guard10.reject.out b/testdata/language-features/guard/guard10.reject.out
index 75235ae7..a3d44ad4 100644
--- a/testdata/language-features/guard/guard10.reject.out
+++ b/testdata/language-features/guard/guard10.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/guard/guard10.reject.lc:2:1:
 unexpected '|'
-expecting "class", "data", "infix", "infixl", "infixr", "instance", "type", ''', backquoted ident, end of input, expression, lambda, lhs, literal, lowercase ident, operator definition, pattern, rest of expression, symbols, typed ident, or uppercase ident
\ No newline at end of file
+expecting "class", "data", "infix", "infixl", "infixr", "instance", "type", end of input, lhs, operator definition, pattern, the rest of expression, or typed ident
diff --git a/testdata/language-features/module/Moduledef05.reject.out b/testdata/language-features/module/Moduledef05.reject.out
index 89576ae1..dbcc8dc6 100644
--- a/testdata/language-features/module/Moduledef05.reject.out
+++ b/testdata/language-features/module/Moduledef05.reject.out
@@ -1,3 +1,3 @@
 ./testdata/language-features/module/Moduledef05.reject.lc:3:1:
-unexpected 'h'
-expecting "where" or '('
\ No newline at end of file
+unexpected "hello"
+expecting "where" or '('
diff --git a/testdata/listcompr01.reject.out b/testdata/listcompr01.reject.out
index 4a83b569..998b9602 100644
--- a/testdata/listcompr01.reject.out
+++ b/testdata/listcompr01.reject.out
@@ -1,3 +1,3 @@
 ./testdata/listcompr01.reject.lc:6:42:
 unexpected ','
-expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', '~', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
\ No newline at end of file
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', '~', backquoted ident, end of input, expression, lambda, literal, lowercase ident, swizzling, symbols, the rest of expression, or uppercase ident
diff --git a/testdata/syntax01.reject.out b/testdata/syntax01.reject.out
index d10effd7..829bf033 100644
--- a/testdata/syntax01.reject.out
+++ b/testdata/syntax01.reject.out
@@ -1,3 +1,2 @@
 ./testdata/syntax01.reject.lc:3:1:
-expecting expression
-wrong indentation
\ No newline at end of file
+wrong indentation