chris/orgize
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(elements): add Element::Empty variant

Browse source
This commit is contained in:
PoiScript 2019-02-16 15:39:28 +08:00
parent c7de340479
commit 74a19c2ff7
2 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/parser.rs
View file

@ -261,21 +261,17 @@ impl<'a> Parser<'a> {
fn next_ele(&mut self, end: usize) -> Event<'a> {
let text = &self.text[self.off..end];
let (ele, off) = self
.ele_buf
.take()
.map(|(ele, off)| (Some(ele), off))
.unwrap_or_else(|| {
let (ele, off, next_ele) = elements::parse(text);
self.ele_buf = next_ele;
(ele, off)
});
let (ele, off) = self.ele_buf.take().unwrap_or_else(|| {
let (ele, off, next_ele) = elements::parse(text);
self.ele_buf = next_ele;
(ele, off)
});
debug_assert!(off <= text.len());
self.off += off;
ele.map(|x| match x {
match ele {
Element::Paragraph { cont_end, end } => {
debug_assert!(cont_end <= text.len() && end <= text.len());
self.stack.push(Container::Paragraph {
@ -346,8 +342,8 @@ impl<'a> Parser<'a> {
Element::Rule => Event::Rule,
Element::SrcBlock { args, cont } => Event::SrcBlock { args, cont },
Element::VerseBlock { args, cont } => Event::VerseBlock { args, cont },
})
.unwrap_or_else(|| self.end())
Element::Empty => self.end(),
}
}
fn next_obj(&mut self, end: usize) -> Event<'a> {