Skip to content

Commit

Permalink
Merge pull request fwcd#95 from amaanq/conflicts
Browse files Browse the repository at this point in the history
fix: remove unnecessary conflicts
  • Loading branch information
fwcd authored Oct 6, 2023
2 parents ea3c8b5 + b612f21 commit 5baa0fe
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
9 changes: 0 additions & 9 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ module.exports = grammar({
// Ambiguous when used in an explicit delegation expression,
// since the '{' could either be interpreted as the class body
// or as the anonymous function body. Consider the following sequence:
//
// 'class' simple_identifier ':' user_type 'by' 'fun' '(' ')' • '{' …
//
// Possible interpretations:
//
// 'class' simple_identifier ':' user_type 'by' (anonymous_function 'fun' '(' ')' • function_body)
// 'class' simple_identifier ':' user_type 'by' (anonymous_function 'fun' '(' ')') • '{' …
[$.anonymous_function],

// Member access operator '::' conflicts with callable reference
[$._primary_expression, $.callable_reference],
Expand All @@ -84,7 +76,6 @@ module.exports = grammar({
[$._postfix_unary_expression, $._expression],

// ambiguity between generics and comparison operations (foo < b > c)
[$.call_expression, $.prefix_expression, $.comparison_expression],
[$.call_expression, $.range_expression, $.comparison_expression],
[$.call_expression, $.elvis_expression, $.comparison_expression],
[$.call_expression, $.check_expression, $.comparison_expression],
Expand Down
8 changes: 0 additions & 8 deletions src/grammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -6089,9 +6089,6 @@
}
],
"conflicts": [
[
"anonymous_function"
],
[
"_primary_expression",
"callable_reference"
Expand All @@ -6112,11 +6109,6 @@
"_postfix_unary_expression",
"_expression"
],
[
"call_expression",
"prefix_expression",
"comparison_expression"
],
[
"call_expression",
"range_expression",
Expand Down

0 comments on commit 5baa0fe

Please sign in to comment.