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

add precedence to splat operators; test for associativity

Browse Source
This commit is contained in:
mhoffm
2021-06-18 07:29:00 +02:00
parent b793cd7c37
commit 9b79cbda48
5 changed files with 6585 additions and 6476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
grammar.js
View File

@@ -16,8 +16,6 @@ module.exports = grammar({
name: 'hcl',
conflicts: $ => [
[$.attr_splat],
[$.full_splat],
// string literals are just quoted template without template stuff
[$.string_lit, $.quoted_template],
],
@@ -145,18 +143,15 @@ module.exports = grammar({
splat: $ => choice($.attr_splat, $.full_splat),
attr_splat: $ => seq(
'.',
'*',
attr_splat: $ => prec.right(seq(
'.*',
repeat($.get_attr),
),
)),
full_splat: $ => seq(
'[',
'*',
']',
full_splat: $ => prec.right(seq(
'[*]',
repeat(choice($.get_attr, $.index)),
),
)),
for_expr: $ => choice($.for_tuple_expr, $.for_object_expr),

96
src/grammar.json
View File

@@ -480,57 +480,53 @@
]
},
"attr_splat": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "."
},
{
"type": "STRING",
"value": "*"
},
{
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "get_attr"
"type": "PREC_RIGHT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ".*"
},
{
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "get_attr"
}
}
}
]
]
}
},
"full_splat": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "["
},
{
"type": "STRING",
"value": "*"
},
{
"type": "STRING",
"value": "]"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "get_attr"
},
{
"type": "SYMBOL",
"name": "index"
}
]
"type": "PREC_RIGHT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "[*]"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "get_attr"
},
{
"type": "SYMBOL",
"name": "index"
}
]
}
}
}
]
]
}
},
"for_expr": {
"type": "CHOICE",
@@ -1210,12 +1206,6 @@
}
],
"conflicts": [
[
"attr_splat"
],
[
"full_splat"
],
[
"string_lit",
"quoted_template"

8
src/node-types.json
View File

@@ -756,6 +756,10 @@
"type": ".",
"named": false
},
{
"type": ".*",
"named": false
},
{
"type": "/",
"named": false
@@ -800,6 +804,10 @@
"type": "[",
"named": false
},
{
"type": "[*]",
"named": false
},
{
"type": "]",
"named": false

12900
src/parser.c
View File

File diff suppressed because it is too large Load Diff

40
test/corpus/splat.txt
View File

@@ -52,9 +52,9 @@ foo = bar.*.foo
(variable_expr
(identifier))
(splat
(attr_splat))
(get_attr
(identifier))))))
(attr_splat
(get_attr
(identifier))))))))
================================================================================
full splat
@@ -64,6 +64,26 @@ foo = bar[*].foo
--------------------------------------------------------------------------------
(config_file
(body
(attribute
(identifier)
(expression
(variable_expr
(identifier))
(splat
(full_splat
(get_attr
(identifier))))))))
================================================================================
full splat repeated
================================================================================
foo = bar[*][*].a.b.c[d]
--------------------------------------------------------------------------------
(config_file
(body
(attribute
@@ -73,5 +93,15 @@ foo = bar[*].foo
(identifier))
(splat
(full_splat))
(get_attr
(identifier))))))
(splat
(full_splat
(get_attr
(identifier))
(get_attr
(identifier))
(get_attr
(identifier))
(index
(expression
(variable_expr
(identifier))))))))))