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

Fix small bugs in conflict reporting

Browse source 
* Negative precedence values were not displayed
* Rule names were repeated in resolution suggestions
This commit is contained in:
Max Brunsfeld 2021-02-01 13:29:58 -08:00
parent 69178fed00
commit 2b0de9dfec
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -577,7 +577,7 @@ impl<'a> ParseTableBuilder<'a> {
"(precedence: {}, associativity: {:?})",
precedence, associativity
))
} else if precedence > 0 {
} else if precedence != 0 {
Some(format!("(precedence: {})", precedence))
} else {
None
@ -619,6 +619,28 @@ impl<'a> ParseTableBuilder<'a> {
}
shift_items.sort_unstable();
reduce_items.sort_unstable();
let list_rule_names = |mut msg: &mut String, items: &[&ParseItem]| {
let mut last_rule_id = None;
for item in items {
if last_rule_id == Some(item.variable_index) {
continue;
}
if last_rule_id.is_some() {
write!(&mut msg, " and").unwrap();
}
last_rule_id = Some(item.variable_index);
write!(
msg,
" `{}`",
self.symbol_name(&Symbol::non_terminal(item.variable_index as usize))
)
.unwrap();
}
};
if actual_conflict.len() > 1 {
if shift_items.len() > 0 {
resolution_count += 1;
@ -628,17 +650,7 @@ impl<'a> ParseTableBuilder<'a> {
resolution_count
)
.unwrap();
for (i, item) in shift_items.iter().enumerate() {
if i > 0 {
write!(&mut msg, " and").unwrap();
}
write!(
&mut msg,
" `{}`",
self.symbol_name(&Symbol::non_terminal(item.variable_index as usize))
)
.unwrap();
}
list_rule_names(&mut msg, &shift_items);
write!(&mut msg, " than in the other rules.\n").unwrap();
}
@ -658,21 +670,11 @@ impl<'a> ParseTableBuilder<'a> {
resolution_count += 1;
write!(
&mut msg,
" {}: Specify a left or right associativity in ",
" {}: Specify a left or right associativity in",
resolution_count
)
.unwrap();
for (i, item) in reduce_items.iter().enumerate() {
if i > 0 {
write!(&mut msg, " and ").unwrap();
}
write!(
&mut msg,
"`{}`",
self.symbol_name(&Symbol::non_terminal(item.variable_index as usize))
)
.unwrap();
}
list_rule_names(&mut msg, &reduce_items);
write!(&mut msg, "\n").unwrap();
}