actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separators and links in the prefix chapters are parsed correctly

This commit is contained in:
Michael Bryan 2017-06-28 00:25:52 +08:00
parent df2ee64b2e
commit bfc9112c06
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/loader/summary.rs
View File

@ -168,6 +168,7 @@ impl<'a> SummaryParser<'a> {
fn step(&mut self) -> Result<()> { fn step(&mut self) -> Result<()> {
let next_event = self.stream.next().expect("TODO: error-chain"); let next_event = self.stream.next().expect("TODO: error-chain");
trace!("[*] Current state = {:?}, Next Event = {:?}", self.state, next_event); trace!("[*] Current state = {:?}, Next Event = {:?}", self.state, next_event);
println!("{:?}", next_event);
match self.state { match self.state {
State::Begin => self.step_start(next_event)?, State::Begin => self.step_start(next_event)?,
@ -191,6 +192,10 @@ impl<'a> SummaryParser<'a> {
/// In the second step we look out for links and horizontal rules to add /// In the second step we look out for links and horizontal rules to add
/// to the prefix. /// to the prefix.
///
/// This state should only progress when it encounters a list. All other
/// events will either be separators (horizontal rule), prefix chapters
/// (the links), or skipped.
fn step_prefix(&mut self, event: Event<'a>) -> Result<()> { fn step_prefix(&mut self, event: Event<'a>) -> Result<()> {
match event { match event {
Event::Start(Tag::Link(location, _)) => { Event::Start(Tag::Link(location, _)) => {
@ -202,8 +207,14 @@ impl<'a> SummaryParser<'a> {
number: None, number: None,
nested_items: Vec::new(), nested_items: Vec::new(),
}; };
debug!("[*] Found a prefix chapter, {:?}", link.name);
self.summary.prefix_chapters.push(SummaryItem::Link(link)); self.summary.prefix_chapters.push(SummaryItem::Link(link));
} }
Event::End(Tag::Rule) => {
debug!("[*] Found a prefix chapter separator");
self.summary.prefix_chapters.push(SummaryItem::Separator);
}
other => { other => {
debug!("[*] Skipping unexpected token in summary: {:?}", other); debug!("[*] Skipping unexpected token in summary: {:?}", other);