refactoring: ask less for desugarInfo during parsing; bugfix: fix parser monad stack order

9 files changed, 10 insertions, 31 deletions

diff --git a/testdata/language-features/adt/gadt02.reject.out b/testdata/language-features/adt/gadt02.reject.out
index 3fe83aee..9fd5aa56 100644
--- a/testdata/language-features/adt/gadt02.reject.out
+++ b/testdata/language-features/adt/gadt02.reject.out
@@ -1,3 +1,3 @@
 testdata/language-features/adt/gadt02.reject.lc:2:9:
 unexpected 'T'
-expecting end of input
+expecting "::", "where", '=', '@', ::, end of input, or lowercase ident
diff --git a/testdata/language-features/basic-values/indentation03.reject.out b/testdata/language-features/basic-values/indentation03.reject.out
index bc713876..5fe5403c 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 end of input
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
diff --git a/testdata/language-features/basic-values/indentation04.reject.out b/testdata/language-features/basic-values/indentation04.reject.out
index b92a40d0..8ff2d6c1 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 end of input
+expecting ''', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, symbols, or uppercase ident
diff --git a/testdata/language-features/basic-values/infix04.reject.out b/testdata/language-features/basic-values/infix04.reject.out
index d2a3ee4b..efb2c5a4 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 end of input
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, or uppercase ident
diff --git a/testdata/language-features/basic-values/where02.reject.out b/testdata/language-features/basic-values/where02.reject.out
index 56a3474a..3a8033a4 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 end of input
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
diff --git a/testdata/language-features/basic-values/where03.reject.out b/testdata/language-features/basic-values/where03.reject.out
index 9f82a3ed..a2898961 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 end of input
+expecting ''', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, symbols, or uppercase ident
diff --git a/testdata/language-features/guard/guard10.reject.out b/testdata/language-features/guard/guard10.reject.out
index c95daa25..54362d2a 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", end of input, lhs, operator definition, pattern, or typed ident
+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
diff --git a/testdata/listcompr01.reject.out b/testdata/listcompr01.reject.out
index 92ed6ec1..9984d166 100644
--- a/testdata/listcompr01.reject.out
+++ b/testdata/listcompr01.reject.out
@@ -1,3 +1,3 @@
 testdata/listcompr01.reject.lc:6:42:
 unexpected ','
-expecting end of input
+expecting "->", "::", "=>", "let", "where", ''', '(', '@', '[', '_', '{', '~', backquoted ident, end of input, expression, lambda, literal, lowercase ident, rest of expression, swizzling, symbols, or uppercase ident
diff --git a/testdata/nameclash01.reject.out b/testdata/nameclash01.reject.out
index 2f824e15..e8bdc61d 100644
--- a/testdata/nameclash01.reject.out
+++ b/testdata/nameclash01.reject.out
@@ -1,24 +1,3 @@
-type error: can not unify
-'HList V1
-with
-'Image 1 (Color ('VecScalar 1 'Float))
-
-in testdata/nameclash01.reject.lc:2:48:
+Constructor FrameBuffer is not defined at testdata/nameclash01.reject.lc:2:9:
     let FrameBuffer = FrameBuffer (colorImage1 1.0)
-                                               ^^^
-
------------- trace
-!type error: can not unify
-'HList V1
-with
-'Image 1 (Color ('VecScalar 1 'Float))
-
-in testdata/nameclash01.reject.lc:2:48:
-    let FrameBuffer = FrameBuffer (colorImage1 1.0)
-                                               ^^^
-
------------- tooltips
-testdata/nameclash01.reject.lc 2:23-2:34  {a : List Type} -> {b : 'sameLayerCounts a} -> HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
-testdata/nameclash01.reject.lc 2:36-2:47  {a:Nat} -> {b} -> {c} -> {d : Num b} -> {e : c ~ VecScalar a b} -> c -> Image 1 ('Color c)
-testdata/nameclash01.reject.lc 2:36-2:51  Image 1 ('Color (VecScalar 1 Float))
-testdata/nameclash01.reject.lc 2:48-2:51  Float
+        ^^^^^^^^^^^