fix ambiguity with *-expressions Fixed ambiguity with expressions with asterisks, like local declarations with pointer types, pointer dereferences, or multiplications.

Changes

4 changed files (+54/-39)

• grammar.js
  • @@ -62,13 +62,12 @@ module.exports = grammar({
    ), _expression: $ => choice( - seq('(', $._expression, ')'), $._contained_expression, $.initializer, $.yield_expression, $.lambda_expression, $.static_cast_expression, - $.unary_expression, + $._unary_expression, $.multiplicative_expression, $.arithmetic_expression, $.in_expression,
  • @@ -89,6 +88,7 @@ module.exports = grammar({
    // expressions that never need to be wrapped in parentheses _contained_expression: $ => choice( + seq('(', $._expression, ')'), $.literal, $.array_creation_expression, $.object_creation_expression,
  • @@ -105,20 +105,14 @@ module.exports = grammar({
    member_access_expression: $ => seq( optional(seq( - choice( - $._contained_expression, - seq('(', $._expression, ')') - ), + $._contained_expression, choice('.', '?.', '->'), )), $.identifier ), element_access_expression: $ => seq( - choice( - $._contained_expression, - seq('(', $._expression, ')'), - ), + $._contained_expression, repeat1($.element_access) ),
  • @@ -167,7 +161,20 @@ module.exports = grammar({
    static_cast_expression: $ => prec.right(14, seq('(', choice($.type, '!', 'owned'), ')', $._expression)), typeof_expression: $ => prec.right(14, seq('typeof', '(', $.type, ')')), sizeof_expression: $ => prec.right(14, seq('sizeof', '(', $.type, ')')), - unary_expression: $ => prec.right(14, seq(choice('!', 'not', '~', '++', '--', '-', '*', '&'), $._expression)), + dereferencing_expression: $ => prec.right(14, seq('*', $._contained_expression)), + addressof_expression: $ => prec.right(14, seq('&', $._contained_expression)), + arithmetic_negation_expression: $ => prec.right(14, seq('-', $._contained_expression)), + prefix_expression: $ => prec.right(14, seq(choice('++', '--'), $._contained_expression)), + bitwise_negation_expression: $ => prec.right(14, seq('~', $._contained_expression)), + logical_negation_expression: $ => prec.right(14, seq(choice('!', 'not'), $._contained_expression)), + _unary_expression: $ => prec.right(14, choice( + $.dereferencing_expression, + $.addressof_expression, + $.arithmetic_negation_expression, + $.prefix_expression, + $.bitwise_negation_expression, + $.logical_negation_expression + )), multiplicative_expression: $ => prec.left(13, seq($._expression, choice('*', '/', '%'), $._expression)), arithmetic_expression: $ => prec.left(12, seq($._expression, choice('+', '-'), $._expression)), bitshift_expression: $ => prec.left(11, seq($._expression, choice('<<', '>>'), $._expression)),
  • @@ -637,18 +644,18 @@ module.exports = grammar({
    local_function_declaration: $ => seq( $.type, - $.symbol, + $.identifier, '(', optional(seq($.parameter, repeat(seq(',', $.parameter)))), ')', $.block ), - assignment: $ => seq( + assignment: $ => prec.dynamic(20, seq( $.identifier, optional($.inline_array_type), optional(seq('=', $._expression)) - ), + )), block: $ => seq('{', repeat(choice($._statement, $.local_declaration, $.local_function_declaration)), '}'),
  • @@ -660,8 +667,8 @@ module.exports = grammar({
    // resolves ambiguities with 'else if' _statement_without_if: $ => choice( $.block, - ';', - seq($._expression, ';'), + $.empty_statement, + $.expression_statement, $.return_statement, $.try_statement, $.while_statement,
  • @@ -678,6 +685,10 @@ module.exports = grammar({
    $.with_statement ), + empty_statement: $ => ';', + + expression_statement: $ => seq($._expression, ';'), + return_statement: $ => seq('return', optional($._expression), ';'), if_statement: $ => seq(
• queries/highlights.scm
  • @@ -6,8 +6,7 @@
    (attribute) @attribute (method_declaration (symbol (symbol) @type (identifier) @function.method)) (method_declaration (symbol (identifier) @function.method)) - (local_function_declaration (symbol (symbol) @type (identifier) @function)) - (local_function_declaration (symbol (identifier) @function)) + (local_function_declaration (identifier) @function) (destructor_declaration (identifier) @function) (creation_method_declaration (symbol (symbol) @type (identifier) @constructor)) (creation_method_declaration (symbol (identifier) @constructor))
• queries/locals.scm
  • @@ -9,6 +9,6 @@
    (parameter (identifier) @local.definition) (local_declaration (assignment (identifier) @local.definition)) - (local_function_declaration (symbol (identifier) @local.definition)) + (local_function_declaration (identifier) @local.definition) (member_access_expression . (identifier) @local.reference)
• test/corpus/expressions.txt
  • @@ -18,24 +18,29 @@ void main() {
    (type) (symbol (identifier)) (block - (arithmetic_expression - (literal (integer)) - (member_access_expression (member_access_expression (identifier)) (identifier))) - (in_expression - (member_access_expression (identifier)) - (method_call_expression (member_access_expression (identifier)))) - (assignment_expression - (literal (integer)) - (literal (integer))) - (method_call_expression - (member_access_expression + (expression_statement + (arithmetic_expression + (literal (integer)) + (member_access_expression (member_access_expression (identifier)) (identifier)))) + (expression_statement + (in_expression + (member_access_expression (identifier)) + (method_call_expression (member_access_expression (identifier))))) + (expression_statement + (assignment_expression + (literal (integer)) + (literal (integer)))) + (expression_statement + (method_call_expression (member_access_expression - (member_access_expression (identifier)) - (identifier)) - (identifier))) - (method_call_expression - (member_access_expression - (arithmetic_expression - (literal (integer)) - (literal (integer))) - (identifier))))))) + (member_access_expression + (member_access_expression (identifier)) + (identifier)) + (identifier)))) + (expression_statement + (method_call_expression + (member_access_expression + (arithmetic_expression + (literal (integer)) + (literal (integer))) + (identifier))))))))