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

refactor: simplify list parsing

Browse source
This commit is contained in:
PoiScript 2019-02-02 23:42:31 +08:00
parent 763ec00434
commit d20d4c2880
9 changed files with 562 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/objects/mod.rs
View file

@ -51,13 +51,13 @@ impl<'a> Object<'a> {
return (Object::Text(src), src.len(), None);
}
let chars = ascii_chars!('@', ' ', '"', '(', '\n', '{', '<', '[');
let bs = bytes!(b'@', b' ', b'"', b'(', b'\n', b'{', b'<', b'[');
let mut pos = 0;
loop {
macro_rules! brk {
($obj:expr, $off:expr, $pos:expr) => {
break if pos == 0 {
break if $pos == 0 {
($obj, $off, None)
} else {
(Object::Text(&src[0..$pos]), $pos, Some(($obj, $off)))
@ -159,8 +159,8 @@ impl<'a> Object<'a> {
_ => (),
}
if let Some(off) = chars
.find(&src[pos + 1..])
if let Some(off) = bs
.find(&bytes[pos + 1..])
.map(|i| i + pos + 1)
.filter(|&i| i < src.len() - 2)
{