fluencelabs/lalrpop
1
0
Fork 0
mirror of https://github.com/fluencelabs/lalrpop synced 2025-03-16 17:00:53 +00:00
Code Issues Projects Releases Wiki Activity

Only insert annotations when type parameters exist

Browse Source
This commit is contained in:
Tjaden Hess 2018-11-11 16:53:46 -05:00
parent 8d27a4ab1c
commit c1ed927dac
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lalrpop/src/build/action.rs
View File

@ -350,6 +350,11 @@ fn emit_inline_action_code<W: Write>(
// Now create temporaries for the inlined things
let mut arg_counter = 0;
let mut temp_counter = 0;
// if there are type parameters then type annotation is required
let annotate = !grammar.non_lifetime_type_parameters().is_empty();
let lparen = if annotate {"::<"} else {"("};
for symbol in &data.symbols {
match *symbol {
r::InlinedSymbol::Original(_) => {
@ -359,16 +364,17 @@ fn emit_inline_action_code<W: Write>(
// execute the inlined reduce action
rust!(
rust,
"let {}temp{} = {}action{}::<",
"let {}temp{} = {}action{}{}",
grammar.prefix,
temp_counter,
grammar.prefix,
inlined_action.index()
inlined_action.index(),
lparen
);
for t in grammar.non_lifetime_type_parameters() {
rust!(rust, "{},", t);
}
rust!(rust, ">(");
if annotate {rust!(rust, ">(")};
for parameter in &grammar.parameters {
rust!(rust, "{},", parameter.name);
}
@ -400,11 +406,11 @@ fn emit_inline_action_code<W: Write>(
}
}
}
rust!(rust, "{}action{}::<", grammar.prefix, data.action.index());
rust!(rust, "{}action{}{}", grammar.prefix, data.action.index(), lparen);
for t in grammar.non_lifetime_type_parameters() {
rust!(rust, "{},", t);
}
rust!(rust, ">(");
if annotate {rust!(rust, ">(")};
for parameter in &grammar.parameters {
rust!(rust, "{},", parameter.name);
}