Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 7c1607c

Browse files
vkutuevvkutuev
committed
Fixed grammars in tests
1 parent 3d8e643 commit 7c1607c

4 files changed

Lines changed: 252 additions & 58 deletions

File tree

‎test/resources/grammars/graph/g1/grammar.json‎

Lines changed: 96 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,23 @@
1010
"body" : [
1111
{
1212
"kind": "Terminal",
13-
"name": "b",
13+
"name": "subClassOf_r",
1414
"regex": {
15-
"kind": "Char",
16-
"val": 98
15+
"kind": "Seq",
16+
"symbols": [
17+
{"kind": "Char", "val": 115},
18+
{"kind": "Char", "val": 117},
19+
{"kind": "Char", "val": 98},
20+
{"kind": "Char", "val": 67},
21+
{"kind": "Char", "val": 108},
22+
{"kind": "Char", "val": 97},
23+
{"kind": "Char", "val": 115},
24+
{"kind": "Char", "val": 115},
25+
{"kind": "Char", "val": 79},
26+
{"kind": "Char", "val": 102},
27+
{"kind": "Char", "val": 95},
28+
{"kind": "Char", "val": 114}
29+
]
1730
}
1831
},
1932
{
@@ -22,10 +35,21 @@
2235
},
2336
{
2437
"kind": "Terminal",
25-
"name": "a",
38+
"name": "subClassOf",
2639
"regex": {
27-
"kind": "Char",
28-
"val": 97
40+
"kind": "Seq",
41+
"symbols": [
42+
{"kind": "Char", "val": 115},
43+
{"kind": "Char", "val": 117},
44+
{"kind": "Char", "val": 98},
45+
{"kind": "Char", "val": 67},
46+
{"kind": "Char", "val": 108},
47+
{"kind": "Char", "val": 97},
48+
{"kind": "Char", "val": 115},
49+
{"kind": "Char", "val": 115},
50+
{"kind": "Char", "val": 79},
51+
{"kind": "Char", "val": 102}
52+
]
2953
}
3054
}
3155
]
@@ -39,18 +63,42 @@
3963
"body" : [
4064
{
4165
"kind": "Terminal",
42-
"name": "b",
66+
"name": "subClassOf_r",
4367
"regex": {
44-
"kind": "Char",
45-
"val": 98
68+
"kind": "Seq",
69+
"symbols": [
70+
{"kind": "Char", "val": 115},
71+
{"kind": "Char", "val": 117},
72+
{"kind": "Char", "val": 98},
73+
{"kind": "Char", "val": 67},
74+
{"kind": "Char", "val": 108},
75+
{"kind": "Char", "val": 97},
76+
{"kind": "Char", "val": 115},
77+
{"kind": "Char", "val": 115},
78+
{"kind": "Char", "val": 79},
79+
{"kind": "Char", "val": 102},
80+
{"kind": "Char", "val": 95},
81+
{"kind": "Char", "val": 114}
82+
]
4683
}
4784
},
4885
{
4986
"kind": "Terminal",
50-
"name": "a",
87+
"name": "subClassOf",
5188
"regex": {
52-
"kind": "Char",
53-
"val": 97
89+
"kind": "Seq",
90+
"symbols": [
91+
{"kind": "Char", "val": 115},
92+
{"kind": "Char", "val": 117},
93+
{"kind": "Char", "val": 98},
94+
{"kind": "Char", "val": 67},
95+
{"kind": "Char", "val": 108},
96+
{"kind": "Char", "val": 97},
97+
{"kind": "Char", "val": 115},
98+
{"kind": "Char", "val": 115},
99+
{"kind": "Char", "val": 79},
100+
{"kind": "Char", "val": 102}
101+
]
54102
}
55103
}
56104
]
@@ -64,10 +112,17 @@
64112
"body" : [
65113
{
66114
"kind": "Terminal",
67-
"name": "d",
115+
"name": "type_r",
68116
"regex": {
69-
"kind": "Char",
70-
"val": 100
117+
"kind": "Seq",
118+
"symbols": [
119+
{"kind": "Char", "val": 116},
120+
{"kind": "Char", "val": 121},
121+
{"kind": "Char", "val": 112},
122+
{"kind": "Char", "val": 101},
123+
{"kind": "Char", "val": 95},
124+
{"kind": "Char", "val": 114}
125+
]
71126
}
72127
},
73128
{
@@ -76,10 +131,15 @@
76131
},
77132
{
78133
"kind": "Terminal",
79-
"name": "c",
134+
"name": "type",
80135
"regex": {
81-
"kind": "Char",
82-
"val": 99
136+
"kind": "Seq",
137+
"symbols": [
138+
{"kind": "Char", "val": 116},
139+
{"kind": "Char", "val": 121},
140+
{"kind": "Char", "val": 112},
141+
{"kind": "Char", "val": 101}
142+
]
83143
}
84144
}
85145
]
@@ -93,23 +153,34 @@
93153
"body" : [
94154
{
95155
"kind": "Terminal",
96-
"name": "d",
156+
"name": "type_r",
97157
"regex": {
98-
"kind": "Char",
99-
"val": 100
158+
"kind": "Seq",
159+
"symbols": [
160+
{"kind": "Char", "val": 116},
161+
{"kind": "Char", "val": 121},
162+
{"kind": "Char", "val": 112},
163+
{"kind": "Char", "val": 101},
164+
{"kind": "Char", "val": 95},
165+
{"kind": "Char", "val": 114}
166+
]
100167
}
101168
},
102169
{
103170
"kind": "Terminal",
104-
"name": "c",
171+
"name": "type",
105172
"regex": {
106-
"kind": "Char",
107-
"val": 99
173+
"kind": "Seq",
174+
"symbols": [
175+
{"kind": "Char", "val": 116},
176+
{"kind": "Char", "val": 121},
177+
{"kind": "Char", "val": 112},
178+
{"kind": "Char", "val": 101}
179+
]
108180
}
109181
}
110182
]
111183
}
112-
113184
],
114185
"startSymbol" : {
115186
"kind" : "Start",

‎test/resources/grammars/graph/g2/grammar.json‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,23 @@
1010
"body" : [
1111
{
1212
"kind": "Terminal",
13-
"name": "b",
13+
"name": "subClassOf_r",
1414
"regex": {
15-
"kind": "Char",
16-
"val": 98
15+
"kind": "Seq",
16+
"symbols": [
17+
{"kind": "Char", "val": 115},
18+
{"kind": "Char", "val": 117},
19+
{"kind": "Char", "val": 98},
20+
{"kind": "Char", "val": 67},
21+
{"kind": "Char", "val": 108},
22+
{"kind": "Char", "val": 97},
23+
{"kind": "Char", "val": 115},
24+
{"kind": "Char", "val": 115},
25+
{"kind": "Char", "val": 79},
26+
{"kind": "Char", "val": 102},
27+
{"kind": "Char", "val": 95},
28+
{"kind": "Char", "val": 114}
29+
]
1730
}
1831
},
1932
{
@@ -22,10 +35,21 @@
2235
},
2336
{
2437
"kind": "Terminal",
25-
"name": "a",
38+
"name": "subClassOf",
2639
"regex": {
27-
"kind": "Char",
28-
"val": 97
40+
"kind": "Seq",
41+
"symbols": [
42+
{"kind": "Char", "val": 115},
43+
{"kind": "Char", "val": 117},
44+
{"kind": "Char", "val": 98},
45+
{"kind": "Char", "val": 67},
46+
{"kind": "Char", "val": 108},
47+
{"kind": "Char", "val": 97},
48+
{"kind": "Char", "val": 115},
49+
{"kind": "Char", "val": 115},
50+
{"kind": "Char", "val": 79},
51+
{"kind": "Char", "val": 102}
52+
]
2953
}
3054
}
3155
]
@@ -39,10 +63,21 @@
3963
"body" : [
4064
{
4165
"kind": "Terminal",
42-
"name": "a",
66+
"name": "subClassOf",
4367
"regex": {
44-
"kind": "Char",
45-
"val": 97
68+
"kind": "Seq",
69+
"symbols": [
70+
{"kind": "Char", "val": 115},
71+
{"kind": "Char", "val": 117},
72+
{"kind": "Char", "val": 98},
73+
{"kind": "Char", "val": 67},
74+
{"kind": "Char", "val": 108},
75+
{"kind": "Char", "val": 97},
76+
{"kind": "Char", "val": 115},
77+
{"kind": "Char", "val": 115},
78+
{"kind": "Char", "val": 79},
79+
{"kind": "Char", "val": 102}
80+
]
4681
}
4782
}
4883
]

‎test/resources/grammars/graph/geo/grammar.json‎

Lines changed: 88 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,28 @@
1010
"body" : [
1111
{
1212
"kind": "Terminal",
13-
"name": "a",
13+
"name": "broaderTransitive",
1414
"regex": {
15-
"kind": "Char",
16-
"val": 97
15+
"kind": "Seq",
16+
"symbols": [
17+
{"kind": "Char", "val": 98},
18+
{"kind": "Char", "val": 114},
19+
{"kind": "Char", "val": 111},
20+
{"kind": "Char", "val": 97},
21+
{"kind": "Char", "val": 100},
22+
{"kind": "Char", "val": 101},
23+
{"kind": "Char", "val": 114},
24+
{"kind": "Char", "val": 84},
25+
{"kind": "Char", "val": 114},
26+
{"kind": "Char", "val": 97},
27+
{"kind": "Char", "val": 110},
28+
{"kind": "Char", "val": 115},
29+
{"kind": "Char", "val": 105},
30+
{"kind": "Char", "val": 116},
31+
{"kind": "Char", "val": 105},
32+
{"kind": "Char", "val": 118},
33+
{"kind": "Char", "val": 101}
34+
]
1735
}
1836
},
1937
{
@@ -22,10 +40,30 @@
2240
},
2341
{
2442
"kind": "Terminal",
25-
"name": "b",
43+
"name": "broaderTransitive_r",
2644
"regex": {
27-
"kind": "Char",
28-
"val": 98
45+
"kind": "Seq",
46+
"symbols": [
47+
{"kind": "Char", "val": 98},
48+
{"kind": "Char", "val": 114},
49+
{"kind": "Char", "val": 111},
50+
{"kind": "Char", "val": 97},
51+
{"kind": "Char", "val": 100},
52+
{"kind": "Char", "val": 101},
53+
{"kind": "Char", "val": 114},
54+
{"kind": "Char", "val": 84},
55+
{"kind": "Char", "val": 114},
56+
{"kind": "Char", "val": 97},
57+
{"kind": "Char", "val": 110},
58+
{"kind": "Char", "val": 115},
59+
{"kind": "Char", "val": 105},
60+
{"kind": "Char", "val": 116},
61+
{"kind": "Char", "val": 105},
62+
{"kind": "Char", "val": 118},
63+
{"kind": "Char", "val": 101},
64+
{"kind": "Char", "val": 95},
65+
{"kind": "Char", "val": 114}
66+
]
2967
}
3068
}
3169
]
@@ -39,18 +77,56 @@
3977
"body" : [
4078
{
4179
"kind": "Terminal",
42-
"name": "a",
80+
"name": "broaderTransitive",
4381
"regex": {
44-
"kind": "Char",
45-
"val": 97
82+
"kind": "Seq",
83+
"symbols": [
84+
{"kind": "Char", "val": 98},
85+
{"kind": "Char", "val": 114},
86+
{"kind": "Char", "val": 111},
87+
{"kind": "Char", "val": 97},
88+
{"kind": "Char", "val": 100},
89+
{"kind": "Char", "val": 101},
90+
{"kind": "Char", "val": 114},
91+
{"kind": "Char", "val": 84},
92+
{"kind": "Char", "val": 114},
93+
{"kind": "Char", "val": 97},
94+
{"kind": "Char", "val": 110},
95+
{"kind": "Char", "val": 115},
96+
{"kind": "Char", "val": 105},
97+
{"kind": "Char", "val": 116},
98+
{"kind": "Char", "val": 105},
99+
{"kind": "Char", "val": 118},
100+
{"kind": "Char", "val": 101}
101+
]
46102
}
47103
},
48104
{
49105
"kind": "Terminal",
50-
"name": "b",
106+
"name": "broaderTransitive_r",
51107
"regex": {
52-
"kind": "Char",
53-
"val": 98
108+
"kind": "Seq",
109+
"symbols": [
110+
{"kind": "Char", "val": 98},
111+
{"kind": "Char", "val": 114},
112+
{"kind": "Char", "val": 111},
113+
{"kind": "Char", "val": 97},
114+
{"kind": "Char", "val": 100},
115+
{"kind": "Char", "val": 101},
116+
{"kind": "Char", "val": 114},
117+
{"kind": "Char", "val": 84},
118+
{"kind": "Char", "val": 114},
119+
{"kind": "Char", "val": 97},
120+
{"kind": "Char", "val": 110},
121+
{"kind": "Char", "val": 115},
122+
{"kind": "Char", "val": 105},
123+
{"kind": "Char", "val": 116},
124+
{"kind": "Char", "val": 105},
125+
{"kind": "Char", "val": 118},
126+
{"kind": "Char", "val": 101},
127+
{"kind": "Char", "val": 95},
128+
{"kind": "Char", "val": 114}
129+
]
54130
}
55131
}
56132
]

0 commit comments

Comments
 (0)