Skip to content

Fix range parsing #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 9, 2022
Merged

Fix range parsing #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
573907f
fix "endless range" parsing
resolritter Jan 8, 2022
0a9f0b4
regenerate parser
resolritter Jan 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ a..b;
1..(1);
(1)..1;
(1)..(1);
1..{1};
for i in 1.. {
}

---

Expand All @@ -146,7 +149,16 @@ a..b;
(integer_literal))
(range_expression
(parenthesized_expression (integer_literal))
(parenthesized_expression (integer_literal))))
(parenthesized_expression (integer_literal)))
(range_expression
(integer_literal)
(block
(integer_literal)))
(for_expression
(identifier)
(range_expression
(integer_literal))
(block)))

============================================
Assignment expressions
Expand Down
19 changes: 10 additions & 9 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,15 +831,14 @@ module.exports = grammar({

// Section - Expressions

_expression: $ => choice(
_expression_except_range: $ => choice(
$.unary_expression,
$.reference_expression,
$.try_expression,
$.binary_expression,
$.assignment_expression,
$.compound_assignment_expr,
$.type_cast_expression,
$.range_expression,
$.call_expression,
$.return_expression,
$.yield_expression,
Expand All @@ -856,14 +855,19 @@ module.exports = grammar({
$.tuple_expression,
prec(1, $.macro_invocation),
$.unit_expression,
$._expression_ending_with_block,
$.break_expression,
$.continue_expression,
$.index_expression,
$.metavariable,
$.closure_expression,
$.parenthesized_expression,
$.struct_expression
$.struct_expression,
$._expression_ending_with_block,
),

_expression: $ => choice(
$._expression_except_range,
$.range_expression,
),

_expression_ending_with_block: $ => choice(
Expand Down Expand Up @@ -921,10 +925,7 @@ module.exports = grammar({
),

range_expression: $ => prec.left(PREC.range, choice(
prec.left(
PREC.range + 1,
seq($._expression, choice('..', '...', '..='), $._expression)
),
seq($._expression, choice('..', '...', '..='), $._expression),
seq($._expression, '..'),
seq('..', $._expression),
'..'
Expand Down Expand Up @@ -995,7 +996,7 @@ module.exports = grammar({
),

call_expression: $ => prec(PREC.call, seq(
field('function', $._expression),
field('function', $._expression_except_range),
field('arguments', $.arguments)
)),

Expand Down
89 changes: 47 additions & 42 deletions src/grammar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4622,7 +4622,7 @@
"type": "STRING",
"value": "mut"
},
"_expression": {
"_expression_except_range": {
"type": "CHOICE",
"members": [
{
Expand Down Expand Up @@ -4653,10 +4653,6 @@
"type": "SYMBOL",
"name": "type_cast_expression"
},
{
"type": "SYMBOL",
"name": "range_expression"
},
{
"type": "SYMBOL",
"name": "call_expression"
Expand Down Expand Up @@ -4807,10 +4803,6 @@
"type": "SYMBOL",
"name": "unit_expression"
},
{
"type": "SYMBOL",
"name": "_expression_ending_with_block"
},
{
"type": "SYMBOL",
"name": "break_expression"
Expand Down Expand Up @@ -4838,6 +4830,23 @@
{
"type": "SYMBOL",
"name": "struct_expression"
},
{
"type": "SYMBOL",
"name": "_expression_ending_with_block"
}
]
},
"_expression": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_expression_except_range"
},
{
"type": "SYMBOL",
"name": "range_expression"
}
]
},
Expand Down Expand Up @@ -5088,38 +5097,34 @@
"type": "CHOICE",
"members": [
{
"type": "PREC_LEFT",
"value": 16,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ".."
},
{
"type": "STRING",
"value": "..."
},
{
"type": "STRING",
"value": "..="
}
]
},
{
"type": "SYMBOL",
"name": "_expression"
}
]
}
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ".."
},
{
"type": "STRING",
"value": "..."
},
{
"type": "STRING",
"value": "..="
}
]
},
{
"type": "SYMBOL",
"name": "_expression"
}
]
},
{
"type": "SEQ",
Expand Down Expand Up @@ -5787,7 +5792,7 @@
"name": "function",
"content": {
"type": "SYMBOL",
"name": "_expression"
"name": "_expression_except_range"
}
},
{
Expand Down
154 changes: 153 additions & 1 deletion src/node-types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,159 @@
"required": true,
"types": [
{
"type": "_expression",
"type": "_literal",
"named": true
},
{
"type": "array_expression",
"named": true
},
{
"type": "assignment_expression",
"named": true
},
{
"type": "async_block",
"named": true
},
{
"type": "await_expression",
"named": true
},
{
"type": "binary_expression",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "break_expression",
"named": true
},
{
"type": "call_expression",
"named": true
},
{
"type": "closure_expression",
"named": true
},
{
"type": "compound_assignment_expr",
"named": true
},
{
"type": "const_block",
"named": true
},
{
"type": "continue_expression",
"named": true
},
{
"type": "field_expression",
"named": true
},
{
"type": "for_expression",
"named": true
},
{
"type": "generic_function",
"named": true
},
{
"type": "identifier",
"named": true
},
{
"type": "if_expression",
"named": true
},
{
"type": "if_let_expression",
"named": true
},
{
"type": "index_expression",
"named": true
},
{
"type": "loop_expression",
"named": true
},
{
"type": "macro_invocation",
"named": true
},
{
"type": "match_expression",
"named": true
},
{
"type": "metavariable",
"named": true
},
{
"type": "parenthesized_expression",
"named": true
},
{
"type": "reference_expression",
"named": true
},
{
"type": "return_expression",
"named": true
},
{
"type": "scoped_identifier",
"named": true
},
{
"type": "self",
"named": true
},
{
"type": "struct_expression",
"named": true
},
{
"type": "try_expression",
"named": true
},
{
"type": "tuple_expression",
"named": true
},
{
"type": "type_cast_expression",
"named": true
},
{
"type": "unary_expression",
"named": true
},
{
"type": "unit_expression",
"named": true
},
{
"type": "unsafe_block",
"named": true
},
{
"type": "while_expression",
"named": true
},
{
"type": "while_let_expression",
"named": true
},
{
"type": "yield_expression",
"named": true
}
]
Expand Down
Loading