Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 23 additions & 3 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ module.exports = grammar({

[$.receiver_type],
[$.receiver_type, $._type],

// ambiguity between prefix expression in unary and assignable contexts
[$._unary_expression, $.assignable_expression],
],

externals: $ => [
Expand Down Expand Up @@ -609,7 +612,7 @@ module.exports = grammar({
assignment: $ => choice(
prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, $._assignment_and_operator, $._expression)),
prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, "=", $._expression)),
// TODO
prec.left(PREC.ASSIGNMENT, seq($.assignable_expression, $._assignment_and_operator, $._expression))
),

// ==========
Expand Down Expand Up @@ -971,11 +974,28 @@ module.exports = grammar({
PREC.ASSIGNMENT,
choice(
$._postfix_unary_expression,
$.simple_identifier
// TODO
$.simple_identifier,
$.parenthesized_directly_assignable_expression
)
),

parenthesized_directly_assignable_expression: $ => seq(
"(",
$.directly_assignable_expression,
")"
),

assignable_expression: $ => choice(
$.prefix_expression,
$.parenthesized_assignable_expression
),

parenthesized_assignable_expression: $ => seq(
"(",
$.assignable_expression,
")"
),

// ==========
// Modifiers
// ==========
Expand Down
76 changes: 76 additions & 0 deletions src/grammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -2931,6 +2931,27 @@
}
]
}
},
{
"type": "PREC_LEFT",
"value": 1,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "assignable_expression"
},
{
"type": "SYMBOL",
"name": "_assignment_and_operator"
},
{
"type": "SYMBOL",
"name": "_expression"
}
]
}
}
]
},
Expand Down Expand Up @@ -5087,10 +5108,61 @@
{
"type": "SYMBOL",
"name": "simple_identifier"
},
{
"type": "SYMBOL",
"name": "parenthesized_directly_assignable_expression"
}
]
}
},
"parenthesized_directly_assignable_expression": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SYMBOL",
"name": "directly_assignable_expression"
},
{
"type": "STRING",
"value": ")"
}
]
},
"assignable_expression": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "prefix_expression"
},
{
"type": "SYMBOL",
"name": "parenthesized_assignable_expression"
}
]
},
"parenthesized_assignable_expression": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SYMBOL",
"name": "assignable_expression"
},
{
"type": "STRING",
"value": ")"
}
]
},
"modifiers": {
"type": "PREC_LEFT",
"value": 0,
Expand Down Expand Up @@ -6422,6 +6494,10 @@
[
"receiver_type",
"_type"
],
[
"_unary_expression",
"assignable_expression"
]
],
"precedences": [],
Expand Down
Loading
Loading