employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

tamer: parse::util::expand::StitchableExpansionState: Utilize bimap 

This is just a light refactoring to utilize the new
`TransitionResult::bimap` method.

DEV-13156
main
Mike Gerwitz 2022-11-16 10:36:14 -05:00
parent 60ce1305cc
commit 8cb4eb5b81
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tamer/src/parse/util/expand.rs
View File

@ -121,12 +121,12 @@ where
) -> TransitionResult<Self::Super> {
use Expansion::*;
match self {
Self { st, _phantom } => {
let TransitionResult(Transition(st_new), data) =
st.parse_token(tok, ctx);
let Self { st, _phantom } = self;
let data_new = data.map_when_obj(|obj, la| match (obj, la) {
st.parse_token(tok, ctx).bimap(
|st| Self { st, _phantom },
|data| {
data.map_when_obj(|obj, la| match (obj, la) {
(Expanded(obj), la) => {
TransitionData::Result(Ok(ParseStatus::Object(obj)), la)
}
@ -143,7 +143,7 @@ where
let desc = vec![
tok.span().note(
"while processing this \
Expansion::DoneExpanding token",
Expansion::DoneExpanding token",
),
la_tok.span().internal_error(
"encountered this unexpected lookahead token",
@ -153,24 +153,16 @@ where
diagnostic_panic!(
desc,
"cannot provide lookahead token with \
Expansion::DoneExpanding",
Expansion::DoneExpanding",
)
}
(DoneExpanding(tok), None) => {
TransitionData::Dead(Lookahead(tok))
}
});
TransitionResult(
Transition(Self {
st: st_new,
_phantom,
}),
data_new,
)
}
}
})
},
)
}
fn is_accepting(&self, ctx: &Self::Context) -> bool {