Skip to content

Indent trace statements for readability #249

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Indent trace statements for readability #249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d01281c
trace indent
therealbnut Feb 7, 2021
47e3e21
Compact empty trace scopes
therealbnut Feb 7, 2021
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
83 changes: 74 additions & 9 deletions peg-macros/translate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,72 @@ fn make_parse_state(grammar: &Grammar) -> TokenStream {
}
}

let (trace_def, trace_set, trace_push_pop) = if cfg!(feature = "trace") {
(
quote! { __trace_depth: usize, __trace_want_prefix: bool, __trace_follows_start: bool, },
quote! { __trace_depth: 0, __trace_want_prefix: true, __trace_follows_start: false, },
quote! {
fn __trace_print_impl(&mut self) {
if self.__trace_want_prefix {
if self.__trace_follows_start {
print!(" {{\n");
}
print!("[PEG_TRACE] ");
for _ in 0..self.__trace_depth {
print!(" ");
}
}
}
fn __trace_print(&mut self) {
self.__trace_want_prefix = true;
self.__trace_print_impl();
self.__trace_follows_start = false;
self.__trace_want_prefix = true;
}
fn __trace_print_start(&mut self) {
self.__trace_want_prefix = true;
self.__trace_print_impl();
self.__trace_follows_start = true;
self.__trace_want_prefix = false;
self.__trace_depth += 1;
}
fn __trace_print_end(&mut self) {
self.__trace_depth -= 1;
self.__trace_print_impl();
if self.__trace_want_prefix {
print!("}} ");
} else {
print!(", ");
}
self.__trace_follows_start = false;
self.__trace_want_prefix = true;
}
},
)
} else {
(
quote! { },
quote! { },
quote! { },
)
};

quote! {
struct ParseState<'input> {
#trace_def
_phantom: ::std::marker::PhantomData<&'input ()>,
#(#cache_fields_def),*
}

impl<'input> ParseState<'input> {
fn new() -> ParseState<'input> {
ParseState {
#trace_set
_phantom: ::std::marker::PhantomData,
#(#cache_fields: ::std::collections::HashMap::new()),*
}
}
#trace_push_pop
}
}
}
Expand Down Expand Up @@ -179,16 +232,19 @@ fn compile_rule(context: &Context, rule: &Rule) -> TokenStream {
let str_rule_name = rule_name.to_string();
quote! {{
let loc = ::peg::Parse::position_repr(__input, __pos);
println!("[PEG_TRACE] Attempting to match rule `{}` at {}", #str_rule_name, loc);
__state.__trace_print_start();
print!("Attempting rule `{}` at {}", #str_rule_name, loc);
let __peg_result: ::peg::RuleResult<#ret_ty> = {#body};
match __peg_result {
::peg::RuleResult::Matched(epos, v) => {
let eloc = ::peg::Parse::position_repr(__input, epos);
println!("[PEG_TRACE] Matched rule `{}` at {} to {}", #str_rule_name, loc, eloc);
__state.__trace_print_end();
println!("matched `{}` from {} to {}", #str_rule_name, loc, eloc);
::peg::RuleResult::Matched(epos, v)
}
::peg::RuleResult::Failed => {
println!("[PEG_TRACE] Failed to match rule `{}` at {}", #str_rule_name, loc);
__state.__trace_print_end();
println!("failed `{}` at {}", #str_rule_name, loc);
::peg::RuleResult::Failed
}
}
Expand All @@ -209,8 +265,14 @@ fn compile_rule(context: &Context, rule: &Rule) -> TokenStream {
quote! {
let loc = ::peg::Parse::position_repr(__input, __pos);
match &entry {
&::peg::RuleResult::Matched(..) => println!("[PEG_TRACE] Cached match of rule {} at {}", #str_rule_name, loc),
&Failed => println!("[PEG_TRACE] Cached fail of rule {} at {}", #str_rule_name, loc),
&::peg::RuleResult::Matched(..) => {
__state.__trace_print();
println!("Cached match of rule {} at {}", #str_rule_name, loc)
},
&Failed => {
__state.__trace_print();
println!("Cached fail of rule {} at {}", #str_rule_name, loc)
},
};
}
} else {
Expand Down Expand Up @@ -459,11 +521,14 @@ fn compile_expr(context: &Context, e: &Expr, result_used: bool) -> TokenStream {
})
.collect();

let call_func = quote! {
#func(__input, __state, __err_state, __pos #extra_args_call #(, #rule_args_call)*)
};
if result_used {
quote! { #func(__input, __state, __err_state, __pos #extra_args_call #(, #rule_args_call)*) }
call_func
} else {
quote! {
match #func(__input, __state, __err_state, __pos #extra_args_call #(, #rule_args_call)*){
match #call_func {
::peg::RuleResult::Matched(pos, _) => ::peg::RuleResult::Matched(pos, ()),
::peg::RuleResult::Failed => ::peg::RuleResult::Failed,
}
Expand Down Expand Up @@ -774,8 +839,8 @@ fn compile_expr(context: &Context, e: &Expr, result_used: bool) -> TokenStream {

let (enter, leave) = if cfg!(feature = "trace") {
(
quote! {println!("[PEG_TRACE] Entering level {}", min_prec);},
quote! {println!("[PEG_TRACE] Leaving level {}", min_prec);},
quote! {{ __state.__trace_print(); println!("Entering level {}", min_prec); }},
quote! {{ __state.__trace_print(); println!("Leaving level {}", min_prec); }},
)
} else {
(quote!(), quote!())
Expand Down