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

update

Browse source
This commit is contained in:
PoiScript 2019-01-10 20:58:13 +08:00
parent a85efe2056
commit 6f7fa9c920
16 changed files with 622 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/elements/keyword.rs
View file

@ -12,25 +12,13 @@ impl<'a> Keyword<'a> {
let end = eol!(src);
if end == key + 1 {
Some((
Keyword {
key: &src[2..key],
value: "",
},
end,
))
} else {
let space = position!(src, key + 1, |c| !c.is_ascii_whitespace());
Some((
Keyword {
key: &src[2..key],
value: &src[space..end],
},
end,
))
}
Some((
Keyword {
key: &src[2..key],
value: &src[key + 1..end].trim(),
},
end,
))
}
}

145
src/elements/mod.rs
View file

@ -6,13 +6,150 @@ pub use self::fn_def::FnDef;
pub use self::keyword::Keyword;
pub use self::rule::Rule;
#[cfg_attr(test, derive(PartialEq, Debug))]
pub enum Element<'a> {
Paragraph(&'a str),
Paragraph {
// end of the contents
end: usize,
// trailing space
trailing: usize,
},
Keyword(Keyword<'a>),
FnDef(FnDef<'a>),
Rule,
Comment(&'a str),
}
impl<'a> Element<'a> {
pub fn find_elem(src: &'a str) -> (Element<'a>, usize) {
// TODO
(Element::Paragraph(src), src.len())
pub fn next_2(src: &'a str) -> (usize, Option<Element<'a>>, Option<(Element<'a>, usize)>) {
let bytes = src.as_bytes();
let mut pos = skip_empty_line!(src, 0);
let start = pos;
if start == src.len() {
return (start, None, None);
}
loop {
if pos >= src.len() {
return (
start,
Some(Element::Paragraph {
end: if bytes[pos - 1] == b'\n' {
pos - 1
} else {
pos
},
trailing: pos,
}),
None,
);
}
// TODO: refactor with src[..].find('\n')
if pos == start || bytes[pos - 1] == b'\n' {
// Unlike other element, footnote definition must starts at column 0
if bytes[pos] == b'[' {
if let Some((fd, off)) = FnDef::parse(&src[pos..]) {
return if pos == start {
(off + 1, Some(Element::FnDef(fd)), None)
} else {
(
start,
Some(Element::Paragraph {
end: if pos == start { pos } else { pos - 1 },
trailing: pos,
}),
Some((Element::FnDef(fd), off + 1)),
)
};
}
}
let end = pos;
pos = skip_space!(src, pos);
if pos <= src.len() {
if bytes[pos] == b'\n' {
return (
start,
Some(Element::Paragraph {
end: if pos == start { end } else { end - 1 },
trailing: pos,
}),
None,
);
}
// TODO: LaTeX environment
if bytes[pos] == b'\\' {}
// Rule
if bytes[pos] == b'-' {
if let Some(off) = Rule::parse(&src[pos..]) {
return if pos == start {
(off, Some(Element::Rule), None)
} else {
(
start,
Some(Element::Paragraph {
end: if pos == start { end } else { end - 1 },
trailing: pos,
}),
Some((Element::Rule, off)),
)
};
}
}
if bytes[pos] == b'#' {
// Keyword
if bytes[pos + 1] == b'+' {
if let Some((kw, off)) = Keyword::parse(&src[pos..]) {
return if pos == start {
(off, Some(Element::Keyword(kw)), None)
} else {
(
start,
Some(Element::Paragraph {
end: if pos == start { end } else { end - 1 },
trailing: pos - 1,
}),
Some((Element::Keyword(kw), off)),
)
};
}
}
// Comment
if src.as_bytes()[pos + 1] == b' ' {
let eol = eol!(src, pos);
return if pos == start {
(eol, Some(Element::Comment(&src[pos + 1..eol])), None)
} else {
(
start,
Some(Element::Paragraph {
end: if pos == start { end } else { end - 1 },
trailing: pos - 1,
}),
Some((Element::Comment(&src[pos + 1..eol]), eol)),
)
};
}
}
}
}
pos += 1
}
}
}
#[test]
fn next_2() {
// TODO: more tests
assert_eq!(Element::next_2("\n\n\n\n"), (4, None, None));
}

9
src/elements/rule.rs
View file

@ -1,3 +1,4 @@
#[cfg_attr(test, derive(PartialEq, Debug))]
pub struct Rule;
impl Rule {
@ -14,10 +15,10 @@ impl Rule {
#[test]
fn parse() {
assert!(Rule::parse("-----").is_some());
assert!(Rule::parse("--------").is_some());
assert!(Rule::parse(" -----").is_some());
assert!(Rule::parse("\t\t-----").is_some());
assert_eq!(Rule::parse("-----").unwrap(), "-----".len());
assert_eq!(Rule::parse("--------").unwrap(), "--------".len());
assert_eq!(Rule::parse(" -----").unwrap(), " -----".len());
assert_eq!(Rule::parse("\t\t-----").unwrap(), "\t\t-----".len());
assert!(Rule::parse("").is_none());
assert!(Rule::parse("----").is_none());