Split off parts of the runtime module into input, forest and parser.
#115
Conversation
This reverts commit ec48a00.
There was a problem hiding this comment.
This definitely helps clean the code organization up!
I'm actually kind of eager to see the not-gll-specific parts pulled into grammer because that makes it easier for me to go and provide potential improvement refactoring 🙃
Let's wait for qmx or Centril to 👍 this though.
| @@ -0,0 +1,546 @@ | |||
| use crate::high::{type_lambda, ExistsL, PairL}; | |||
There was a problem hiding this comment.
Could generally use some doc comments on all pub items in the module.
| if splits.len() > 1 { | ||
| return Err(MoreThanOne); | ||
| } | ||
| let &split = splits.iter().next().unwrap(); |
There was a problem hiding this comment.
This seems to have the same structure as in one_choice -- refactor out this bit?
There was a problem hiding this comment.
They're in different(ly typed) maps.
There was a problem hiding this comment.
But there must be some common generic interface? Would be sad if not...
| .get(&node) | ||
| .into_iter() | ||
| .flatten() | ||
| .cloned() |
There was a problem hiding this comment.
Everything until here is also repeated in all_choices -- refactor out?
There was a problem hiding this comment.
That's... because this is how you iterate an Option<&Set<T>>?
| .cloned() | ||
| .collect(); | ||
| let mut seen: BTreeSet<_> = queue.iter().cloned().collect(); | ||
| let mut p = 0; |
There was a problem hiding this comment.
Could do better than just a one letter name p. :)
| .collect(); | ||
| let mut seen: BTreeSet<_> = queue.iter().cloned().collect(); | ||
| let mut p = 0; | ||
| while let Some(source) = queue.pop_front() { |
There was a problem hiding this comment.
Would be good to describe the algorithm used here so future readers need to think less.
| None | ||
| } | ||
| match self.parser.input_consume_left(pat) { | ||
| Some(parser) => Some(Runtime { |
There was a problem hiding this comment.
| Some(parser) => Some(Runtime { | |
| Some(parser) => Some(Self { |
| current: self.current, | ||
| saved: self.saved, | ||
| }), | ||
| None => None, |
| }) | ||
| } | ||
| match self.parser.input_consume_right(pat) { | ||
| Some(parser) => Some(Runtime { |
There was a problem hiding this comment.
| Some(parser) => Some(Runtime { | |
| Some(parser) => Some(Self { |
| state: self.state, | ||
| current: self.current, | ||
| saved: self.saved, | ||
| }), | ||
| None => None, |
| } | ||
| }) | ||
| } | ||
| fn step<'i>(self, rt: Runtime<'_, 'i, Self, I>); |
There was a problem hiding this comment.
| fn step<'i>(self, rt: Runtime<'_, 'i, Self, I>); | |
| fn step(self, rt: Runtime<'_, '_, Self, I>); |
Only
runtimeremains GLL-specific, the other modules can be moved togrammerat some point.