traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix non-deterministic conflict message order

Browse source
This commit is contained in:
Max Brunsfeld 2019-03-29 17:36:19 -07:00
parent 00968db983
commit 6490b1e4f2
4 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/fixtures/test_grammars/conflict_in_repeat_rule/expected_error.txt vendored
View file

@ -9,6 +9,6 @@ Possible interpretations:
Possible resolutions:
1: Specify a higher precedence in `array_type_repeat1` than in the other rules.
2: Specify a higher precedence in `array_repeat1` than in the other rules.
1: Specify a higher precedence in `array_repeat1` than in the other rules.
2: Specify a higher precedence in `array_type_repeat1` than in the other rules.
3: Add a conflict for these rules: `array`, `array_type`

4
test/fixtures/test_grammars/conflict_in_repeat_rule_after_external_token/expected_error.txt vendored
View file

@ -9,6 +9,6 @@ Possible interpretations:
Possible resolutions:
1: Specify a higher precedence in `array_type_repeat1` than in the other rules.
2: Specify a higher precedence in `array_repeat1` than in the other rules.
1: Specify a higher precedence in `array_repeat1` than in the other rules.
2: Specify a higher precedence in `array_type_repeat1` than in the other rules.
3: Add a conflict for these rules: `array`, `array_type`

4
test/fixtures/test_grammars/partially_resolved_conflict/expected_error.txt vendored
View file

@ -9,6 +9,6 @@ Possible interpretations:
Possible resolutions:
1: Specify a higher precedence in `unary_b` than in the other rules.
2: Specify a higher precedence in `unary_a` than in the other rules.
1: Specify a higher precedence in `unary_a` than in the other rules.
2: Specify a higher precedence in `unary_b` than in the other rules.
3: Add a conflict for these rules: `unary_a`, `unary_b`