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

37
cli/src/generate/build_tables/build_parse_table.rs
View file

@ -520,12 +520,17 @@ impl<'a> ParseTableBuilder<'a> {
let mut resolution_count = 0;
write!(&mut msg, "\nPossible resolutions:\n\n").unwrap();
let mut shift_items = conflicting_items
.iter()
.filter(|i| !i.is_done())
.cloned()
.collect::<Vec<_>>();
let mut shift_items = Vec::new();
let mut reduce_items = Vec::new();
for item in conflicting_items {
if item.is_done() {
reduce_items.push(item);
} else {
shift_items.push(item);
}
}
shift_items.sort_unstable();
reduce_items.sort_unstable();
if actual_conflict.len() > 1 {
if shift_items.len() > 0 {
resolution_count += 1;
@ -549,17 +554,15 @@ impl<'a> ParseTableBuilder<'a> {
write!(&mut msg, " than in the other rules.\n").unwrap();
}
for item in &conflicting_items {
if item.is_done() {
resolution_count += 1;
write!(
&mut msg,
" {}: Specify a higher precedence in `{}` than in the other rules.\n",
resolution_count,
self.symbol_name(&Symbol::non_terminal(item.variable_index as usize))
)
.unwrap();
}
for item in &reduce_items {
resolution_count += 1;
write!(
&mut msg,
" {}: Specify a higher precedence in `{}` than in the other rules.\n",
resolution_count,
self.symbol_name(&Symbol::non_terminal(item.variable_index as usize))
)
.unwrap();
}
}
@ -571,7 +574,7 @@ impl<'a> ParseTableBuilder<'a> {
resolution_count
)
.unwrap();
for (i, item) in conflicting_items.iter().filter(|i| i.is_done()).enumerate() {
for (i, item) in reduce_items.iter().enumerate() {
if i > 0 {
write!(&mut msg, " and ").unwrap();
}

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`