Skip to content

Print source snippet for lookahead value of rr-conflicts #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
May 23, 2025
Merged

Print source snippet for lookahead value of rr-conflicts #578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lrpar/src/lib/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,14 @@ impl<'a> SpannedDiagnosticFormatter<'a> {
let (_r1_prod_names, _r1_prod_spans) = pidx_prods_data(ast, *r1_prod_idx);
let (_r2_prod_names, _r2_prod_spans) = pidx_prods_data(ast, *r2_prod_idx);

let t_name = grm.token_name(*t_idx).unwrap_or("$");
let (t_name, t_span) = if let Some(name) = grm.token_name(*t_idx) {
(name, grm.token_span(*t_idx))
} else {
(
"$",
grm.token_idx("$").and_then(|t_idx| grm.token_span(t_idx)),
)
};
let r1_rule_idx = grm.prod_to_rule(*r1_prod_idx);
let r2_rule_idx = grm.prod_to_rule(*r2_prod_idx);
let r1_span = grm.rule_name_span(r1_rule_idx);
Expand All @@ -287,6 +294,9 @@ impl<'a> SpannedDiagnosticFormatter<'a> {
);
out.pushln(self.underline_span_with_text(r1_span, "First reduce".to_string(), '^'));
out.pushln(self.underline_span_with_text(r2_span, "Second reduce".to_string(), '-'));
if let Some(t_span) = t_span {
out.pushln(self.underline_span_with_text(t_span, "Lookahead".to_string(), '+'));
}
out.push('\n');
}
for (s_tok_idx, r_prod_idx, _st_idx) in c.sr_conflicts() {
Expand Down