Skip to content

Disambiguate parenthesized range expressions from call expressions #100

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
Feb 17, 2021
Merged

Disambiguate parenthesized range expressions from call expressions #100

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
5c3aa24
disambiguate parenthesized range expressions from call expressions
resolritter Jan 7, 2021
486002a
regenerate parser for 'range_expression'
resolritter Jan 7, 2021
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
16 changes: 14 additions & 2 deletions corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ Range expressions
..;
1..b;
a..b;
1..(1);
(1)..1;
(1)..(1);

---

Expand All @@ -134,7 +137,16 @@ a..b;
(range_expression (integer_literal))
(range_expression)
(range_expression (integer_literal) (identifier))
(range_expression (identifier) (identifier)))
(range_expression (identifier) (identifier))
(range_expression
(integer_literal)
(parenthesized_expression (integer_literal)))
(range_expression
(parenthesized_expression (integer_literal))
(integer_literal))
(range_expression
(parenthesized_expression (integer_literal))
(parenthesized_expression (integer_literal))))

============================================
Assignment expressions
Expand Down Expand Up @@ -802,4 +814,4 @@ let three_ranges = [const { (0..=5).into_inner() }; 3];
(integer_literal)))
field: (field_identifier))
arguments: (arguments))))
length: (integer_literal))))
length: (integer_literal))))
7 changes: 5 additions & 2 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const PREC = {
range: 15,
call: 14,
field: 13,
unary: 11,
Expand All @@ -11,7 +12,6 @@ const PREC = {
comparative: 4,
and: 3,
or: 2,
range: 1,
assign: 0,
closure: -1,
}
Expand Down Expand Up @@ -914,7 +914,10 @@ module.exports = grammar({
),

range_expression: $ => prec.left(PREC.range, choice(
seq($._expression, choice('..', '...', '..='), $._expression),
prec.left(
PREC.range + 1,
seq($._expression, choice('..', '...', '..='), $._expression)
),
seq($._expression, '..'),
seq('..', $._expression),
'..'
Expand Down
62 changes: 33 additions & 29 deletions src/grammar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5025,39 +5025,43 @@
},
"range_expression": {
"type": "PREC_LEFT",
"value": 1,
"value": 15,
"content": {
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ".."
},
{
"type": "STRING",
"value": "..."
},
{
"type": "STRING",
"value": "..="
}
]
},
{
"type": "SYMBOL",
"name": "_expression"
}
]
"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",
Expand Down
Loading