kitchen/oysh
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(parser): get rid of tailcall in favor of chain

Browse source 
Signed-off-by: Charlotte Meyer <dev@buffet.sh>
This commit is contained in:
buffet 2022-11-06 19:25:16 +00:00
parent 4a9d49fbd8
commit f215335627
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/oyster_parser/src/parser.rs
View file

@ -114,15 +114,6 @@ impl Iterator for Parser<'_> {
}}; }};
} }
macro_rules! tailcall {
($rule:expr) => {{
use NodeKind::*;
self.stack.pop();
self.stack.push($rule);
Some(ParseEvent::StartNode($rule))
}};
}
macro_rules! leaf { macro_rules! leaf {
($type:expr $(, $mode:ident)?) => {{ ($type:expr $(, $mode:ident)?) => {{
use NodeKind::*; use NodeKind::*;
@ -200,7 +191,7 @@ impl Iterator for Parser<'_> {
Newlines => leaf!(Newlines), Newlines => leaf!(Newlines),
Comment => leaf!(Comment), Comment => leaf!(Comment),
PlainText | DoubleQuote | OpeningParenthesis | EscapedChar => { PlainText | DoubleQuote | OpeningParenthesis | EscapedChar => {
tailcall!(Command) chain!(call!(Command), ret!())
} }
Semicolon => chain_buf!(chain!(error!(UnexpectedSemicolon), ret!()), ret!()), Semicolon => chain_buf!(chain!(error!(UnexpectedSemicolon), ret!()), ret!()),
Pipe => chain!(error!(UnexpectedPipe), ret!()), Pipe => chain!(error!(UnexpectedPipe), ret!()),