mirror/crowbook
1
0
Fork 0
mirror of https://github.com/lise-henry/crowbook synced 2024-09-30 00:43:44 +02:00
Code Issues

Parser: multiple Str(_) in a row are now merged.

Browse Source
This commit is contained in:
Elisabeth Henry 2016-02-18 05:12:55 +01:00
parent c2e9756c8b
commit 46d041b6c8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/parser.rs
View File

@ -5,7 +5,6 @@ use error::{Result,Error};
/// A parser that reads markdown and convert it to AST (a vector of `Token`s)
pub struct Parser {
numbering: Option<String>, // None for no numbering, or a String with the name you want
cleaner: Option<Box<Cleaner>>, // An optional parameter to clean source code
verbatim: bool, // set to true when in e.g. a code block
@ -16,7 +15,6 @@ impl Parser {
pub fn new() -> Parser {
Parser {
verbatim: false,
numbering: None,
cleaner: Some(Box::new(())),
}
}
@ -46,7 +44,15 @@ impl Parser {
cleaner.clean(&mut text);
}
}
v.push(Token::Str(text));
if let Some(&Token::Str(_)) = v.last() {
if let &mut Token::Str(ref mut s) = v.last_mut().unwrap() {
s.to_mut().push_str(&text);
} else {
unreachable!();
}
} else {
v.push(Token::Str(text));
}
},
Event::Start(tag) => try!(self.parse_tag(p, v, tag)),
Event::End(tag) => {