Refactor _expression rule #16
Conversation
|
Hi @vanessa-rodrigues ! However, I don't understand why you hide _decimal_integer_literal and _hexadecimal_integer_literal rules. Sorry for the delay, and thanks again for you contribution! |
|
Hello @atxr, Thanks for catching that. It was not meant to be committed. I just pushed an update. |
There was a problem hiding this comment.
Thanks @vanessa-rodrigues !
But there are still a lot of diff that refactor the _expression
I just want to merge the \r\n feature for now
I understand the tree is currently deep and complex, but for our usages, we need this granularity.
Your _expression rule version simplifies greatly the tree but it also breaks the operators priority.
I propose a patch for this PR that only includes the \r\n feature.
I didn't applied it yet so you can review it (git apply pr16_patch.txt) to confirm I didn't break any \r\n feature.
| multiplicative_expression: $ => prec.left(choice( | ||
| $.format_expression, | ||
| seq ( | ||
| $.multiplicative_expression, | ||
| choice("/", "\\", "%", "*"), $.format_expression | ||
| multiplicative_expression: $ => prec.left( | ||
| seq( | ||
| $._expression, | ||
| choice("/", "\\", "%", "*"), | ||
| $._expression, | ||
| ) | ||
| )), | ||
| ), | ||
|
|
||
| format_expression: $ => prec.left(choice( | ||
| $.range_expression, | ||
| seq ( | ||
| $.format_expression, | ||
| $.format_operator, $.range_expression | ||
| format_expression: $ => prec.left( | ||
| seq( | ||
| $._expression, | ||
| $.format_operator, | ||
| $._expression, | ||
| ) | ||
| )), | ||
| ), | ||
|
|
||
| range_expression: $ => prec.left(choice( | ||
| $.array_literal_expression, | ||
| seq ( | ||
| $.range_expression, | ||
| "..", $.array_literal_expression | ||
| range_expression: $ => prec.left( | ||
| seq( | ||
| $._expression, | ||
| "..", | ||
| $._expression, | ||
| ) | ||
| )), | ||
| ), | ||
|
|
||
| array_literal_expression: $ => prec.left(seq( | ||
| $.unary_expression, | ||
| repeat ( | ||
| $._unary_expression, | ||
| repeat( | ||
| seq( | ||
| ",", | ||
| $.unary_expression | ||
| $._unary_expression | ||
| ) | ||
| ) | ||
| )), | ||
|
|
||
| _unary_expression: $ => prec.right(choice( | ||
| $.unary_expression, | ||
| $._primary_expression | ||
| )), | ||
|
|
||
| unary_expression: $ => prec.right(choice( | ||
| $._primary_expression, | ||
| $.expression_with_unary_operator | ||
| $._expression_with_unary_operator | ||
| )), | ||
|
|
||
| expression_with_unary_operator: $ => choice( | ||
| seq(",", $.unary_expression), | ||
| seq(reservedWord("-not"), $.unary_expression), | ||
| seq("!", $.unary_expression), | ||
| seq(reservedWord("-bnot"), $.unary_expression), | ||
| seq("+", $.unary_expression), | ||
| seq("-", $.unary_expression), | ||
| _expression_with_unary_operator: $ => choice( | ||
| seq(",", $._unary_expression), | ||
| seq(reservedWord("-not"), $._unary_expression), | ||
| seq("!", $._unary_expression), | ||
| seq(reservedWord("-bnot"), $._unary_expression), | ||
| seq("+", $._unary_expression), | ||
| seq("-", $._unary_expression), | ||
| $.pre_increment_expression, | ||
| $.pre_decrement_expression, | ||
| $.cast_expression, | ||
| seq(reservedWord("-split"), $.unary_expression), | ||
| seq(reservedWord("-join"), $.unary_expression) | ||
| seq(reservedWord("-split"), $._unary_expression), | ||
| seq(reservedWord("-join"), $._unary_expression) | ||
| ), | ||
|
|
||
| pre_increment_expression: $ => seq("++", $.unary_expression), | ||
| pre_decrement_expression: $ => seq("--", $.unary_expression), | ||
|
|
||
| pre_increment_expression: $ => seq("++", $._unary_expression), | ||
| pre_decrement_expression: $ => seq("--", $._unary_expression), | ||
|
|
||
| cast_expression: $ => prec(PREC.CAST, seq($.type_literal, $.unary_expression)), | ||
| cast_expression: $ => prec(PREC.CAST, seq($.type_literal, $._unary_expression)), | ||
|
|
||
| attributed_variable: $ => seq($.type_literal, $.variable), | ||
|
|
| )), | ||
|
|
||
| range_argument_expression: $ => prec.left(choice( | ||
| $.unary_expression, | ||
| $._unary_expression, | ||
| seq ( | ||
| $.range_argument_expression, | ||
| "..", $.unary_expression | ||
| "..", $._unary_expression | ||
| ) | ||
| )), | ||
|
|
| @@ -25,11 +26,11 @@ module.exports = grammar({ | |||
| [$.class_property_definition, $.attribute], | |||
| [$.class_method_definition, $.attribute], | |||
| [$.expandable_string_literal], | |||
| [$.path_command_name, $._value] | |||
| [$.path_command_name, $._value], | |||
| [$._expression, $.array_literal_expression] | |||
|
|
||
| label_expression: $ => choice( | ||
| $.label, | ||
| $.unary_expression | ||
| $._unary_expression |
|
|
||
| hash_entry: $ => seq( | ||
| $.key_expression, | ||
| "=", | ||
| $.key_expression, | ||
| "=", | ||
| $._statement, $._statement_terminator, repeat(";") | ||
| ), | ||
|
|
||
| key_expression: $ => choice( | ||
| $.simple_name, | ||
| $.unary_expression | ||
| $._unary_expression | ||
| ), | ||
|
|
| @@ -828,7 +830,7 @@ module.exports = grammar({ | |||
| member_name: $ => choice( | |||
| $.simple_name, | |||
| $.string_literal, | |||
| $.expression_with_unary_operator, | |||
| $._expression_with_unary_operator, | |||
|
I created a separated PR with the "\r\n" change only. But I would like to keep this other PR open as well. |
|
Thanks for splitting the PR! |
(+) Accepts '\r\n'.
(+) Hide _decimal_integer_literal and _hexadecimal_integer_literal rules