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

convert state fns to use rust_fn_header

Browse Source
This commit is contained in:
Niko Matsakis 2015-07-15 05:14:50 -04:00
parent ccf9320b10
commit 43995dd6cf
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lalrpop/src/grammar/parse_tree.rs
View File

@ -328,7 +328,7 @@ impl Display for MacroSymbol {
impl Display for TypeParameter {
fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
match *self {
TypeParameter::Lifetime(s) => write!(fmt, "'{}", s),
TypeParameter::Lifetime(s) => write!(fmt, "{}", s),
TypeParameter::Id(s) => write!(fmt, "{}", s),
}
}

29
lalrpop/src/lr1/ascent.rs
View File

@ -150,18 +150,25 @@ impl<'ascent,'grammar,W:Write> RecursiveAscent<'ascent,'grammar,W> {
// set to true if goto actions are worth generating
let mut fallthrough = false;
rust!(self.out, "pub fn {}state{}<", self.prefix, this_index.0);
rust!(self.out, " {}TOKENS: Iterator<Item={}>,", self.prefix, terminal_type);
rust!(self.out, ">(");
rust!(self.out, "mut {}lookahead: Option<{}>,", self.prefix, terminal_type);
rust!(self.out, "{}tokens: &mut {}TOKENS,", self.prefix, self.prefix);
for i in 0..this_prefix.len() {
rust!(self.out, "{}sym{}: &mut Option<{}>,",
self.prefix, i, this_prefix[i].ty(&self.types));
}
rust!(self.out, ") -> Result<(Option<{}>, {}Nonterminal), Option<{}>> {{",
terminal_type, self.prefix, terminal_type);
let base_args =
vec![format!("mut {}lookahead: Option<{}>", self.prefix, terminal_type),
format!("{}tokens: &mut {}TOKENS", self.prefix, self.prefix)];
let sym_args: Vec<_> =
(0..this_prefix.len())
.map(|i| format!("{}sym{}: &mut Option<{}>",
self.prefix, i, this_prefix[i].ty(&self.types)))
.collect();
try!(self.out.write_pub_fn_header(
self.grammar,
format!("{}state{}", self.prefix, this_index.0),
vec![format!("{}TOKENS: Iterator<Item={}>", self.prefix, terminal_type)],
base_args.into_iter().chain(sym_args).collect(),
format!("Result<(Option<{}>, {}Nonterminal), Option<{}>>",
terminal_type, self.prefix, terminal_type),
vec![]));
rust!(self.out, "{{");
rust!(self.out, "let mut {}result: (Option<{}>, {}Nonterminal);",
self.prefix, terminal_type, self.prefix);