Skip to content

nimbleparse: add -d flag to dump state graph #474

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
Nov 24, 2024
Merged

nimbleparse: add -d flag to dump state graph #474

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion lrtable/src/lib/stategraph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ where
}
o.push_str("}]");
}
for (esym, e_stidx) in self.edges(stidx).iter() {
let mut edges = self.edges(stidx).iter().collect::<Vec<_>>();
edges.sort_by(|(_, x), (_, y)| x.cmp(y));
for (esym, e_stidx) in edges {
write!(
o,
"\n{}{} -> {}",
Expand Down
10 changes: 8 additions & 2 deletions nimbleparse/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn usage(prog: &str, msg: &str) -> ! {
if !msg.is_empty() {
eprintln!("{}", msg);
}
eprintln!("Usage: {} [-r <cpctplus|none>] [-y <eco|grmtools|original>] [-q] <lexer.l> <parser.y> <input file>", leaf);
eprintln!("Usage: {} [-r <cpctplus|none>] [-y <eco|grmtools|original>] [-dq] <lexer.l> <parser.y> <input file>", leaf);
process::exit(1);
}

Expand Down Expand Up @@ -87,6 +87,7 @@ fn main() {
let matches = match Options::new()
.optflag("h", "help", "")
.optflag("q", "quiet", "Don't print warnings such as conflicts")
.optflag("d", "dump-state-graph", "Print the parser state graph")
.optopt(
"r",
"recoverer",
Expand All @@ -109,6 +110,7 @@ fn main() {
usage(prog, "");
}

let dump_state_graph = matches.opt_present("d");
let quiet = matches.opt_present("q");

let recoverykind = match matches.opt_str("r") {
Expand Down Expand Up @@ -187,6 +189,10 @@ fn main() {
}
};

if dump_state_graph {
println!("Stategraph:\n{}\n", sgraph.pp_core_states(&grm));
}

if !quiet {
if let Some(c) = stable.conflicts() {
let formatter = if let Some(yacc_diagnostic_formatter) = &yacc_diagnostic_formatter {
Expand All @@ -213,7 +219,7 @@ fn main() {
if pp_sr {
println!("{}", c.pp_sr(&grm));
}
if pp_rr || pp_sr {
if (pp_rr || pp_sr) && !dump_state_graph {
println!("Stategraph:\n{}\n", sgraph.pp_core_states(&grm));
}
formatter.handle_conflicts::<DefaultLexerTypes<u32>>(
Expand Down