refactor literal parsing

6 files changed, 14 insertions, 16 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 6f407c39..7e947fa9 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -73,10 +73,8 @@ testdata/Builtins.lc 31:52-31:53  Type
 testdata/Builtins.lc 31:54-31:55  Nat
 testdata/Builtins.lc 33:29-33:32  Type
 testdata/Builtins.lc 34:5-34:14  Nat -> Type->Type
-testdata/Builtins.lc 34:15-34:16  Nat
-testdata/Builtins.lc 34:15-35:60  Nat -> Type->Type | Type | Type->Type
 testdata/Builtins.lc 34:21-34:22  Type
-testdata/Builtins.lc 34:21-35:60  Nat->Type
+testdata/Builtins.lc 34:21-35:60  Nat -> Type->Type | Nat->Type | Type->Type
 testdata/Builtins.lc 35:37-35:40  Nat -> Type->Type
 testdata/Builtins.lc 35:37-35:58  Type->Type
 testdata/Builtins.lc 35:37-35:60  Nat->Type | Type
@@ -589,7 +587,7 @@ testdata/Builtins.lc 110:20-112:12  ({a : Component V0} -> V1 -> V2 -> V3 -> Vec
 testdata/Builtins.lc 110:20-113:12  ({a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4) -> {g : Component V1} -> V2 -> V3 -> V4 -> V5 -> VecS V6 4
 testdata/Builtins.lc 110:20-114:19  {a : Component V0}->V1 -> {c : Component V1}->V2
 testdata/Builtins.lc 110:20-115:17  {a : Component V0}->V1 -> {c : Component V1}->V2
-testdata/Builtins.lc 110:20-136:33  Type | Type->Type
+testdata/Builtins.lc 110:20-136:31  Type | Type->Type
 testdata/Builtins.lc 110:20-157:12  {a : Component V0} -> V1 -> V2 -> VecS V3 2 | {a} -> {b : Component a} -> a -> a -> VecS a 2
 testdata/Builtins.lc 110:20-158:12  {a : Component V0} -> V1 -> V2 -> V3 -> VecS V4 3 | {a} -> {b : Component a} -> a -> a -> a -> VecS a 3
 testdata/Builtins.lc 110:20-159:12  {a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4 | {a} -> {b : Component a} -> a -> a -> a -> a -> VecS a 4
@@ -606,7 +604,7 @@ testdata/Builtins.lc 116:20-118:12  ({a : Component V0} -> V1 -> V2 -> V3 -> Vec
 testdata/Builtins.lc 116:20-119:12  ({a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4) -> {g : Component V1} -> V2 -> V3 -> V4 -> V5 -> VecS V6 4
 testdata/Builtins.lc 116:20-120:22  {a : Component V0}->V1 -> {c : Component V1}->V2
 testdata/Builtins.lc 116:20-121:21  {a : Component V0}->V1 -> {c : Component V1}->V2
-testdata/Builtins.lc 116:20-136:33  Type
+testdata/Builtins.lc 116:20-136:31  Type
 testdata/Builtins.lc 116:20-157:12  {a : Component V0} -> V1 -> V2 -> VecS V3 2
 testdata/Builtins.lc 116:20-158:12  {a : Component V0} -> V1 -> V2 -> V3 -> VecS V4 3
 testdata/Builtins.lc 116:20-159:12  {a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4
@@ -627,7 +625,7 @@ testdata/Builtins.lc 123:20-125:12  ({a : Component V0} -> V1 -> V2 -> V3 -> Vec
 testdata/Builtins.lc 123:20-126:12  ({a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4) -> {g : Component V1} -> V2 -> V3 -> V4 -> V5 -> VecS V6 4
 testdata/Builtins.lc 123:20-127:23  {a : Component V0}->V1 -> {c : Component V1}->V2
 testdata/Builtins.lc 123:20-128:22  {a : Component V0}->V1 -> {c : Component V1}->V2
-testdata/Builtins.lc 123:20-136:33  Type
+testdata/Builtins.lc 123:20-136:31  Type
 testdata/Builtins.lc 123:20-157:12  {a : Component V0} -> V1 -> V2 -> VecS V3 2
 testdata/Builtins.lc 123:20-158:12  {a : Component V0} -> V1 -> V2 -> V3 -> VecS V4 3
 testdata/Builtins.lc 123:20-159:12  {a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4
@@ -648,7 +646,7 @@ testdata/Builtins.lc 130:20-132:12  ({a : Component V0} -> V1 -> V2 -> V3 -> Vec
 testdata/Builtins.lc 130:20-133:12  ({a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4) -> {g : Component V1} -> V2 -> V3 -> V4 -> V5 -> VecS V6 4
 testdata/Builtins.lc 130:20-134:17  {a : Component V0}->V1 -> {c : Component V1}->V2
 testdata/Builtins.lc 130:20-135:16  {a : Component V0}->V1 -> {c : Component V1}->V2
-testdata/Builtins.lc 130:20-136:33  Type
+testdata/Builtins.lc 130:20-136:31  Type
 testdata/Builtins.lc 130:20-157:12  {a : Component V0} -> V1 -> V2 -> VecS V3 2
 testdata/Builtins.lc 130:20-158:12  {a : Component V0} -> V1 -> V2 -> V3 -> VecS V4 3
 testdata/Builtins.lc 130:20-159:12  {a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4
@@ -659,7 +657,7 @@ testdata/Builtins.lc 132:10-132:12  {a} -> a -> a -> a -> VecS a 3
 testdata/Builtins.lc 133:10-133:12  {a} -> a -> a -> a -> a -> VecS a 4
 testdata/Builtins.lc 134:14-134:17  Float
 testdata/Builtins.lc 135:13-135:16  Float
-testdata/Builtins.lc 136:26-136:33  Type
+testdata/Builtins.lc 136:26-136:31  Type
 testdata/Builtins.lc 136:26-157:12  ({a : Component V0} -> V1 -> V2 -> VecS V3 2) -> {e : Component V1} -> V2 -> V3 -> VecS V4 2
 testdata/Builtins.lc 136:26-158:12  ({a : Component V0} -> V1 -> V2 -> V3 -> VecS V4 3) -> {f : Component V1} -> V2 -> V3 -> V4 -> VecS V5 3
 testdata/Builtins.lc 136:26-159:12  ({a : Component V0} -> V1 -> V2 -> V3 -> V4 -> VecS V5 4) -> {g : Component V1} -> V2 -> V3 -> V4 -> V5 -> VecS V6 4
@@ -759,9 +757,9 @@ testdata/Builtins.lc 166:25-166:29  Type
 testdata/Builtins.lc 168:7-168:15  Type->Type
 testdata/Builtins.lc 170:25-170:30  Type
 testdata/Builtins.lc 170:25-174:39  Type | Type->Type
-testdata/Builtins.lc 171:31-171:38  Type
+testdata/Builtins.lc 171:31-171:36  Type
 testdata/Builtins.lc 171:31-174:39  Type
-testdata/Builtins.lc 174:30-174:39  Type
+testdata/Builtins.lc 174:34-174:39  Type
 testdata/Builtins.lc 184:6-184:20  Type
 testdata/Builtins.lc 184:6-199:23  Type
 testdata/Builtins.lc 185:7-185:12  BlendingFactor
@@ -1593,7 +1591,7 @@ testdata/Builtins.lc 427:29-427:42  {a} -> {b} -> {c : DefaultFragOp b} -> Fragm
 testdata/Builtins.lc 427:46-427:63  Type->Type
 testdata/Builtins.lc 427:46-427:65  Type
 testdata/Builtins.lc 427:64-427:65  Type
-testdata/Builtins.lc 428:37-428:44  Type
+testdata/Builtins.lc 428:37-428:42  Type
 testdata/Builtins.lc 428:37-428:112  ({a : DefaultFragOp V1} -> FragmentOperation V2) -> {c : DefaultFragOp V2} -> FragmentOperation V3
 testdata/Builtins.lc 428:37-429:36  Type | Type->Type
 testdata/Builtins.lc 428:37-429:77  {a : DefaultFragOp V1} -> FragmentOperation V2 | {a} -> {b : DefaultFragOp a} -> FragmentOperation a
diff --git a/testdata/language-features/basic-values/def05.reject.out b/testdata/language-features/basic-values/def05.reject.out
index 616c6884..59c1b1c2 100644
--- a/testdata/language-features/basic-values/def05.reject.out
+++ b/testdata/language-features/basic-values/def05.reject.out
@@ -1,4 +1,4 @@
 "testdata/language-features/basic-values/def05.reject.lc" (line 4, column 1):
 unexpected end of input
-expecting projection, swizzling, "@", char literal, literal string, float literal, "#", natural, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
+expecting projection, swizzling, "@", literal, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
 different number of arguments of fun at testdata/language-features/basic-values/def05.reject.lc 1:1-1:4
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/def06.reject.out b/testdata/language-features/basic-values/def06.reject.out
index 79952277..852fa677 100644
--- a/testdata/language-features/basic-values/def06.reject.out
+++ b/testdata/language-features/basic-values/def06.reject.out
@@ -1,4 +1,4 @@
 "testdata/language-features/basic-values/def06.reject.lc" (line 5, column 1):
 unexpected end of input
-expecting projection, swizzling, "@", char literal, literal string, float literal, "#", natural, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
+expecting projection, swizzling, "@", literal, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
 different number of arguments of fun2 at testdata/language-features/basic-values/def06.reject.lc 1:1-1:5
\ No newline at end of file
diff --git a/testdata/language-features/basic-values/redefine03.reject.out b/testdata/language-features/basic-values/redefine03.reject.out
index e0050e16..95b587a1 100644
--- a/testdata/language-features/basic-values/redefine03.reject.out
+++ b/testdata/language-features/basic-values/redefine03.reject.out
@@ -1,4 +1,4 @@
 "testdata/language-features/basic-values/redefine03.reject.lc" (line 4, column 1):
 unexpected end of input
-expecting projection, swizzling, "@", char literal, literal string, float literal, "#", natural, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
+expecting projection, swizzling, "@", literal, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs or pattern
 redefined x at testdata/language-features/basic-values/redefine03.reject.lc 2:9-2:10
\ No newline at end of file
diff --git a/testdata/language-features/guard/guard10.reject.out b/testdata/language-features/guard/guard10.reject.out
index 5b95a423..be68325a 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" (line 2, column 1):
 unexpected '|'
-expecting projection, swizzling, "@", char literal, literal string, float literal, "#", natural, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "|", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs, pattern or end of input
\ No newline at end of file
+expecting projection, swizzling, "@", literal, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "|", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs, pattern or end of input
\ No newline at end of file
diff --git a/testdata/listcompr01.reject.out b/testdata/listcompr01.reject.out
index 94560015..81949c98 100644
--- a/testdata/listcompr01.reject.out
+++ b/testdata/listcompr01.reject.out
@@ -1,3 +1,3 @@
 "testdata/listcompr01.reject.lc" (line 6, column 42):
 unexpected ','
-expecting projection, swizzling, "@", char literal, literal string, float literal, "#", natural, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs, pattern or end of input
\ No newline at end of file
+expecting projection, swizzling, "@", literal, "_", "'", identifier, "[", "(", "{", "let", symbols, backquoted ident, "~", expression, lambda, "::", "->", "=>", "where", "data", "class", "instance", type family, type instance, "type", typed ident, "infix", "infixl", "infixr", operator definition, lhs, pattern or end of input
\ No newline at end of file