4 files changed, 91 insertions, 91 deletions
diff --git a/tests/data/lexer/0001_hello.txt b/tests/data/lexer/0001_hello.txt
index e0b6a1f10..27a5940a9 100644
--- a/tests/data/lexer/0001_hello.txt
+++ b/tests/data/lexer/0001_hello.txt
@@ -1,3 +1,3 @@
-IDENT 5
+IDENT 5 "hello"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 5
+IDENT 5 "world"
diff --git a/tests/data/lexer/0002_whitespace.txt b/tests/data/lexer/0002_whitespace.txt
index 4b9885e4a..01d260918 100644
--- a/tests/data/lexer/0002_whitespace.txt
+++ b/tests/data/lexer/0002_whitespace.txt
@@ -1,12 +1,12 @@
-IDENT 1
+IDENT 1 "a"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 1
+IDENT 1 "b"
-WHITESPACE 2
+WHITESPACE 2 "  "
-IDENT 1
+IDENT 1 "c"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-IDENT 1
+IDENT 1 "d"
-WHITESPACE 2
+WHITESPACE 2 "\n\n"
-IDENT 1
+IDENT 1 "e"
-WHITESPACE 1
+WHITESPACE 1 "\t"
-IDENT 1
+IDENT 1 "f"
-WHITESPACE 1
+WHITESPACE 1 "\n"
diff --git a/tests/data/lexer/0003_ident.txt b/tests/data/lexer/0003_ident.txt
index eec82fb91..4a0d5c053 100644
--- a/tests/data/lexer/0003_ident.txt
+++ b/tests/data/lexer/0003_ident.txt
@@ -1,14 +1,14 @@
-IDENT 3
+IDENT 3 "foo"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 4
+IDENT 4 "foo_"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 4
+IDENT 4 "_foo"
-WHITESPACE 1
+WHITESPACE 1 " "
-UNDERSCORE 1
+UNDERSCORE 1 "_"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 2
+IDENT 2 "__"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 1
+IDENT 1 "x"
-WHITESPACE 1
+WHITESPACE 1 " "
-IDENT 12
+IDENT 12 "привет"
-WHITESPACE 1
+WHITESPACE 1 "\n"
diff --git a/tests/data/lexer/0004_number.txt b/tests/data/lexer/0004_number.txt
index e9ad8410d..7dedd2cac 100644
--- a/tests/data/lexer/0004_number.txt
+++ b/tests/data/lexer/0004_number.txt
@@ -1,62 +1,62 @@
-INT_NUMBER 1
+INT_NUMBER 1 "0"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0b"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0o"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0x"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "00"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0_"
-WHITESPACE 1
+WHITESPACE 1 " "
-FLOAT_NUMBER 2
+FLOAT_NUMBER 2 "0."
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0e"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 2
+INT_NUMBER 2 "0E"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 1
+INT_NUMBER 1 "0"
-IDENT 1
+IDENT 1 "z"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-INT_NUMBER 5
+INT_NUMBER 5 "01790"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "0b1790"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "0o1790"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 18
+INT_NUMBER 18 "0x1790aAbBcCdDeEfF"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "001279"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "0_1279"
-WHITESPACE 1
+WHITESPACE 1 " "
-FLOAT_NUMBER 6
+FLOAT_NUMBER 6 "0.1279"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "0e1279"
-WHITESPACE 1
+WHITESPACE 1 " "
-INT_NUMBER 6
+INT_NUMBER 6 "0E1279"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-INT_NUMBER 1
+INT_NUMBER 1 "0"
-ERROR 1
+ERROR 1 "."
-ERROR 1
+ERROR 1 "."
-INT_NUMBER 1
+INT_NUMBER 1 "2"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-INT_NUMBER 1
+INT_NUMBER 1 "0"
-ERROR 1
+ERROR 1 "."
-IDENT 3
+IDENT 3 "foo"
-ERROR 1
+ERROR 1 "("
-ERROR 1
+ERROR 1 ")"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-INT_NUMBER 2
+INT_NUMBER 2 "0e"
-ERROR 1
+ERROR 1 "+"
-INT_NUMBER 1
+INT_NUMBER 1 "1"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-INT_NUMBER 1
+INT_NUMBER 1 "0"
-ERROR 1
+ERROR 1 "."
-IDENT 1
+IDENT 1 "e"
-ERROR 1
+ERROR 1 "+"
-INT_NUMBER 1
+INT_NUMBER 1 "1"
-WHITESPACE 1
+WHITESPACE 1 "\n"
-FLOAT_NUMBER 6
+FLOAT_NUMBER 6 "0.0E-2"
-WHITESPACE 1
+WHITESPACE 1 "\n"

diff --git a/tests/data/lexer/0001_hello.txt b/tests/data/lexer/0001_hello.txt index e0b6a1f10..27a5940a9 100644 --- a/tests/data/lexer/0001_hello.txt +++ b/tests/data/lexer/0001_hello.txt
@@ -1,3 +1,3 @@
1	IDENT 5	1	IDENT 5 "hello"
2	WHITESPACE 1	2	WHITESPACE 1 " "
3	IDENT 5	3	IDENT 5 "world"


diff --git a/tests/data/lexer/0002_whitespace.txt b/tests/data/lexer/0002_whitespace.txt index 4b9885e4a..01d260918 100644 --- a/tests/data/lexer/0002_whitespace.txt +++ b/tests/data/lexer/0002_whitespace.txt
@@ -1,12 +1,12 @@
1	IDENT 1	1	IDENT 1 "a"
2	WHITESPACE 1	2	WHITESPACE 1 " "
3	IDENT 1	3	IDENT 1 "b"
4	WHITESPACE 2	4	WHITESPACE 2 " "
5	IDENT 1	5	IDENT 1 "c"
6	WHITESPACE 1	6	WHITESPACE 1 "\n"
7	IDENT 1	7	IDENT 1 "d"
8	WHITESPACE 2	8	WHITESPACE 2 "\n\n"
9	IDENT 1	9	IDENT 1 "e"
10	WHITESPACE 1	10	WHITESPACE 1 "\t"
11	IDENT 1	11	IDENT 1 "f"
12	WHITESPACE 1	12	WHITESPACE 1 "\n"


diff --git a/tests/data/lexer/0003_ident.txt b/tests/data/lexer/0003_ident.txt index eec82fb91..4a0d5c053 100644 --- a/tests/data/lexer/0003_ident.txt +++ b/tests/data/lexer/0003_ident.txt
@@ -1,14 +1,14 @@
1	IDENT 3	1	IDENT 3 "foo"
2	WHITESPACE 1	2	WHITESPACE 1 " "
3	IDENT 4	3	IDENT 4 "foo_"
4	WHITESPACE 1	4	WHITESPACE 1 " "
5	IDENT 4	5	IDENT 4 "_foo"
6	WHITESPACE 1	6	WHITESPACE 1 " "
7	UNDERSCORE 1	7	UNDERSCORE 1 "_"
8	WHITESPACE 1	8	WHITESPACE 1 " "
9	IDENT 2	9	IDENT 2 "__"
10	WHITESPACE 1	10	WHITESPACE 1 " "
11	IDENT 1	11	IDENT 1 "x"
12	WHITESPACE 1	12	WHITESPACE 1 " "
13	IDENT 12	13	IDENT 12 "привет"
14	WHITESPACE 1	14	WHITESPACE 1 "\n"


diff --git a/tests/data/lexer/0004_number.txt b/tests/data/lexer/0004_number.txt index e9ad8410d..7dedd2cac 100644 --- a/tests/data/lexer/0004_number.txt +++ b/tests/data/lexer/0004_number.txt
@@ -1,62 +1,62 @@
1	INT_NUMBER 1	1	INT_NUMBER 1 "0"
2	WHITESPACE 1	2	WHITESPACE 1 " "
3	INT_NUMBER 2	3	INT_NUMBER 2 "0b"
4	WHITESPACE 1	4	WHITESPACE 1 " "
5	INT_NUMBER 2	5	INT_NUMBER 2 "0o"
6	WHITESPACE 1	6	WHITESPACE 1 " "
7	INT_NUMBER 2	7	INT_NUMBER 2 "0x"
8	WHITESPACE 1	8	WHITESPACE 1 " "
9	INT_NUMBER 2	9	INT_NUMBER 2 "00"
10	WHITESPACE 1	10	WHITESPACE 1 " "
11	INT_NUMBER 2	11	INT_NUMBER 2 "0_"
12	WHITESPACE 1	12	WHITESPACE 1 " "
13	FLOAT_NUMBER 2	13	FLOAT_NUMBER 2 "0."
14	WHITESPACE 1	14	WHITESPACE 1 " "
15	INT_NUMBER 2	15	INT_NUMBER 2 "0e"
16	WHITESPACE 1	16	WHITESPACE 1 " "
17	INT_NUMBER 2	17	INT_NUMBER 2 "0E"
18	WHITESPACE 1	18	WHITESPACE 1 " "
19	INT_NUMBER 1	19	INT_NUMBER 1 "0"
20	IDENT 1	20	IDENT 1 "z"
21	WHITESPACE 1	21	WHITESPACE 1 "\n"
22	INT_NUMBER 5	22	INT_NUMBER 5 "01790"
23	WHITESPACE 1	23	WHITESPACE 1 " "
24	INT_NUMBER 6	24	INT_NUMBER 6 "0b1790"
25	WHITESPACE 1	25	WHITESPACE 1 " "
26	INT_NUMBER 6	26	INT_NUMBER 6 "0o1790"
27	WHITESPACE 1	27	WHITESPACE 1 " "
28	INT_NUMBER 18	28	INT_NUMBER 18 "0x1790aAbBcCdDeEfF"
29	WHITESPACE 1	29	WHITESPACE 1 " "
30	INT_NUMBER 6	30	INT_NUMBER 6 "001279"
31	WHITESPACE 1	31	WHITESPACE 1 " "
32	INT_NUMBER 6	32	INT_NUMBER 6 "0_1279"
33	WHITESPACE 1	33	WHITESPACE 1 " "
34	FLOAT_NUMBER 6	34	FLOAT_NUMBER 6 "0.1279"
35	WHITESPACE 1	35	WHITESPACE 1 " "
36	INT_NUMBER 6	36	INT_NUMBER 6 "0e1279"
37	WHITESPACE 1	37	WHITESPACE 1 " "
38	INT_NUMBER 6	38	INT_NUMBER 6 "0E1279"
39	WHITESPACE 1	39	WHITESPACE 1 "\n"
40	INT_NUMBER 1	40	INT_NUMBER 1 "0"
41	ERROR 1	41	ERROR 1 "."
42	ERROR 1	42	ERROR 1 "."
43	INT_NUMBER 1	43	INT_NUMBER 1 "2"
44	WHITESPACE 1	44	WHITESPACE 1 "\n"
45	INT_NUMBER 1	45	INT_NUMBER 1 "0"
46	ERROR 1	46	ERROR 1 "."
47	IDENT 3	47	IDENT 3 "foo"
48	ERROR 1	48	ERROR 1 "("
49	ERROR 1	49	ERROR 1 ")"
50	WHITESPACE 1	50	WHITESPACE 1 "\n"
51	INT_NUMBER 2	51	INT_NUMBER 2 "0e"
52	ERROR 1	52	ERROR 1 "+"
53	INT_NUMBER 1	53	INT_NUMBER 1 "1"
54	WHITESPACE 1	54	WHITESPACE 1 "\n"
55	INT_NUMBER 1	55	INT_NUMBER 1 "0"
56	ERROR 1	56	ERROR 1 "."
57	IDENT 1	57	IDENT 1 "e"
58	ERROR 1	58	ERROR 1 "+"
59	INT_NUMBER 1	59	INT_NUMBER 1 "1"
60	WHITESPACE 1	60	WHITESPACE 1 "\n"
61	FLOAT_NUMBER 6	61	FLOAT_NUMBER 6 "0.0E-2"
62	WHITESPACE 1	62	WHITESPACE 1 "\n"