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

fix(parser): next_obj & real_inline

Browse source
This commit is contained in:
PoiScript 2019-05-03 01:56:12 +08:00
parent eaf40dcc87
commit 9357ac6278
2 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/objects/emphasis.rs
View file

@ -3,24 +3,22 @@ use memchr::memchr;
#[inline]
/// returns offset
pub fn parse(src: &str, marker: u8) -> Option<usize> {
debug_assert!(src.len() >= 3);
pub fn parse(text: &str, marker: u8) -> Option<usize> {
debug_assert!(text.len() >= 3);
let bytes = src.as_bytes();
let bytes = text.as_bytes();
if bytes[1].is_ascii_whitespace() {
return None;
}
let end = memchr(marker, &bytes[1..])
.map(|i| i + 1)
.filter(|&i| count(&bytes[1..i], b'\n') < 2)?;
let end = memchr(marker, &bytes[1..]).filter(|&i| count(&bytes[1..i + 1], b'\n') < 2)?;
if bytes[end - 1].is_ascii_whitespace() {
if bytes[end].is_ascii_whitespace() {
return None;
}
if let Some(&post) = bytes.get(end + 1) {
if let Some(&post) = bytes.get(end + 2) {
if post == b' '
|| post == b'-'
|| post == b'.'
@ -33,12 +31,12 @@ pub fn parse(src: &str, marker: u8) -> Option<usize> {
|| post == b')'
|| post == b'}'
{
Some(end)
Some(end + 2)
} else {
None
}
} else {
Some(end)
Some(end + 2)
}
}
@ -48,8 +46,8 @@ mod tests {
fn parse() {
use super::parse;
assert_eq!(parse("*bold*", b'*'), Some("*bold".len()));
assert_eq!(parse("*bo\nld*", b'*'), Some("*bo\nld".len()));
assert_eq!(parse("*bold*", b'*'), Some("*bold*".len()));
assert_eq!(parse("*bo\nld*", b'*'), Some("*bo\nld*".len()));
assert_eq!(parse("*bold*a", b'*'), None);
assert_eq!(parse("*bold*", b'/'), None);
assert_eq!(parse("*bold *", b'*'), None);