jenterkin/tree-sitter-jhcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle string_literal and quoted_template conflict with precedences

Browse Source
This commit is contained in:
mhoffm
2021-06-21 21:08:51 +02:00
parent a496ca0823
commit d57a44c2c3
4 changed files with 222 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/grammar.json
View File

@@ -302,21 +302,25 @@
"value": "null"
},
"string_lit": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_quoted_template_start"
},
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "_quoted_template_end"
}
]
"type": "PREC",
"value": 2,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_quoted_template_start"
},
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "_quoted_template_end"
}
]
}
},
"collection_value": {
"type": "CHOICE",
@@ -1163,37 +1167,41 @@
]
},
"quoted_template": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_quoted_template_start"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
}
]
"type": "PREC",
"value": 1,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_quoted_template_start"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
}
]
}
},
{
"type": "SYMBOL",
"name": "_quoted_template_end"
}
},
{
"type": "SYMBOL",
"name": "_quoted_template_end"
}
]
]
}
},
"strip_marker": {
"type": "STRING",
@@ -1324,12 +1332,7 @@
"name": "_whitespace"
}
],
"conflicts": [
[
"string_lit",
"quoted_template"
]
],
"conflicts": [],
"precedences": [],
"externals": [
{