Skip to content

Commit 4a7631f

Browse files
committed
simplify some terminals
1 parent bc8f90d commit 4a7631f

File tree

5 files changed

+289300
-286891
lines changed

5 files changed

+289300
-286891
lines changed

grammar/exp.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module.exports = {
107107

108108
exp_th_quoted_name: $ => choice(
109109
seq('\'', $._cons),
110-
seq('\'', token.immediate('\''), $._atype),
110+
seq('\'\'', $._atype),
111111
seq('\'', $._vars),
112112
),
113113

grammar/type.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,9 @@ module.exports = {
246246
'_',
247247
),
248248

249-
_role: _ => 'role',
250-
251249
decl_role: $ => seq(
252250
'type',
253-
$._role,
251+
'role',
254252
$._tycons,
255253
repeat1($.type_role),
256254
)

src/grammar.json

+3-14
Original file line numberDiff line numberDiff line change
@@ -1537,10 +1537,6 @@
15371537
}
15381538
]
15391539
},
1540-
"_role": {
1541-
"type": "STRING",
1542-
"value": "role"
1543-
},
15441540
"decl_role": {
15451541
"type": "SEQ",
15461542
"members": [
@@ -1549,8 +1545,8 @@
15491545
"value": "type"
15501546
},
15511547
{
1552-
"type": "SYMBOL",
1553-
"name": "_role"
1548+
"type": "STRING",
1549+
"value": "role"
15541550
},
15551551
{
15561552
"type": "SYMBOL",
@@ -2601,14 +2597,7 @@
26012597
"members": [
26022598
{
26032599
"type": "STRING",
2604-
"value": "'"
2605-
},
2606-
{
2607-
"type": "IMMEDIATE_TOKEN",
2608-
"content": {
2609-
"type": "STRING",
2610-
"value": "'"
2611-
}
2600+
"value": "''"
26122601
},
26132602
{
26142603
"type": "SYMBOL",

src/node-types.json

+8
Original file line numberDiff line numberDiff line change
@@ -15151,6 +15151,10 @@
1515115151
"type": "'",
1515215152
"named": false
1515315153
},
15154+
{
15155+
"type": "''",
15156+
"named": false
15157+
},
1515415158
{
1515515159
"type": "(",
1515615160
"named": false
@@ -15447,6 +15451,10 @@
1544715451
"type": "representational",
1544815452
"named": false
1544915453
},
15454+
{
15455+
"type": "role",
15456+
"named": false
15457+
},
1545015458
{
1545115459
"type": "safety",
1545215460
"named": true

0 commit comments

Comments
 (0)