Skip to content

Commit 1c2b003

Browse files
authored
Merge pull request #7 from kaermorchen/filter-expression-name
Add name field to filter_expression
2 parents f9a1cdd + 1a3229f commit 1c2b003

4 files changed

Lines changed: 23 additions & 30 deletions

File tree

grammar.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,8 @@ module.exports = grammar({
271271
seq(
272272
field('object', choice($.expression, $.primary_expression)),
273273
'|',
274-
field(
275-
'filter',
276-
seq($.identifier, optional(field('arguments', $.arguments))),
277-
),
274+
field('name', $.identifier),
275+
optional(field('arguments', $.arguments)),
278276
),
279277
),
280278

src/grammar.json

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,32 +2216,27 @@
22162216
},
22172217
{
22182218
"type": "FIELD",
2219-
"name": "filter",
2219+
"name": "name",
22202220
"content": {
2221-
"type": "SEQ",
2222-
"members": [
2223-
{
2221+
"type": "SYMBOL",
2222+
"name": "identifier"
2223+
}
2224+
},
2225+
{
2226+
"type": "CHOICE",
2227+
"members": [
2228+
{
2229+
"type": "FIELD",
2230+
"name": "arguments",
2231+
"content": {
22242232
"type": "SYMBOL",
2225-
"name": "identifier"
2226-
},
2227-
{
2228-
"type": "CHOICE",
2229-
"members": [
2230-
{
2231-
"type": "FIELD",
2232-
"name": "arguments",
2233-
"content": {
2234-
"type": "SYMBOL",
2235-
"name": "arguments"
2236-
}
2237-
},
2238-
{
2239-
"type": "BLANK"
2240-
}
2241-
]
2233+
"name": "arguments"
22422234
}
2243-
]
2244-
}
2235+
},
2236+
{
2237+
"type": "BLANK"
2238+
}
2239+
]
22452240
}
22462241
]
22472242
}

src/node-types.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@
691691
}
692692
]
693693
},
694-
"filter": {
694+
"name": {
695695
"multiple": false,
696696
"required": true,
697697
"types": [

src/parser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
15331533
{field_alternative, 2},
15341534
{field_condition, 0},
15351535
[14] =
1536-
{field_filter, 2},
1536+
{field_name, 2},
15371537
{field_object, 0},
15381538
[16] =
15391539
{field_expr, 2},
@@ -1560,7 +1560,7 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
15601560
{field_slice, 2},
15611561
[30] =
15621562
{field_arguments, 3},
1563-
{field_filter, 2},
1563+
{field_name, 2},
15641564
{field_object, 0},
15651565
[33] =
15661566
{field_variable, 1},

0 commit comments

Comments
 (0)