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

refactor: utils macros

Browse source
This commit is contained in:
PoiScript 2019-01-14 14:10:12 +08:00
parent 93ed18602a
commit 75362bd2a8
16 changed files with 70 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/objects/cookie.rs
View file

@ -11,7 +11,7 @@ impl<'a> Cookie<'a> {
}
let num1 = until_while!(src, 1, |c| c == b'%' || c == b'/', |c: u8| c
.is_ascii_digit());
.is_ascii_digit())?;
if src.as_bytes()[num1] == b'%' && *src.as_bytes().get(num1 + 1)? == b']' {
Some((
@ -21,7 +21,7 @@ impl<'a> Cookie<'a> {
num1 + 2,
))
} else {
let num2 = until_while!(src, num1 + 1, b']', |c: u8| c.is_ascii_digit());
let num2 = until_while!(src, num1 + 1, b']', |c: u8| c.is_ascii_digit())?;
Some((
Cookie {
value: &src[0..=num2],

8
src/objects/emphasis.rs
View file

@ -3,7 +3,7 @@ pub struct Emphasis;
impl Emphasis {
// TODO: return usize instead of Option<usize>
pub fn parse(src: &str, marker: u8) -> Option<usize> {
expect!(src, 1, |c: u8| !c.is_ascii_whitespace());
expect!(src, 1, |c: u8| !c.is_ascii_whitespace())?;
let mut lines = 0;
let end = until_while!(src, 1, marker, |c| {
@ -11,9 +11,9 @@ impl Emphasis {
lines += 1;
}
lines < 2
});
})?;
expect!(src, end - 1, |c: u8| !c.is_ascii_whitespace());
expect!(src, end - 1, |c: u8| !c.is_ascii_whitespace())?;
if end < src.len() - 1 {
expect!(src, end + 1, |ch| ch == b' '
@ -26,7 +26,7 @@ impl Emphasis {
|| ch == b'\''
|| ch == b'\n'
|| ch == b')'
|| ch == b'}');
|| ch == b'}')?;
}
Some(end)

2
src/objects/entity.rs
View file

@ -7,7 +7,7 @@ impl<'a> Entity<'a> {
pub fn parse(src: &'a str) -> Option<(Entity<'a>, usize)> {
expect!(src, 0, b'\\')?;
let name = position!(src, 1, |c| !c.is_ascii_alphabetic());
let name = 0;
if src.as_bytes()[name] == b'[' {
Some((

2
src/objects/fn_ref.rs
View file

@ -13,7 +13,7 @@ impl<'a> FnRef<'a> {
pub fn parse(src: &'a str) -> Option<(FnRef<'a>, usize)> {
starts_with!(src, "[fn:");
let label = until_while!(src, 4, |c| c == b']' || c == b':', valid_label);
let label = until_while!(src, 4, |c| c == b']' || c == b':', valid_label)?;
if src.as_bytes()[label] == b':' {
let mut pairs = 1;

10
src/objects/inline_call.rs
View file

@ -14,28 +14,28 @@ impl<'a> InlineCall<'a> {
starts_with!(src, "call_");
let mut pos = until_while!(src, 5, |c| c == b'[' || c == b'(', |c: u8| c
.is_ascii_graphic());
.is_ascii_graphic())?;
let mut pos_;
let name = &src[5..pos];
let inside_header = if src.as_bytes()[pos] == b'[' {
pos_ = pos;
pos = until_while!(src, pos, b']', |c: u8| c != b'\n') + 1;
expect!(src, pos, b'(');
pos = until_while!(src, pos, b']', |c: u8| c != b'\n')? + 1;
expect!(src, pos, b'(')?;
Some(&src[pos_ + 1..pos - 1])
} else {
None
};
pos_ = pos;
pos = until_while!(src, pos, b')', |c| c != b'\n');
pos = until_while!(src, pos, b')', |c| c != b'\n')?;
let args = &src[pos_ + 1..pos];
let end_header = if src.len() > pos + 1 && src.as_bytes()[pos + 1] == b'[' {
pos_ = pos;
pos = until_while!(src, pos_ + 1, |c| c == b']', |c: u8| c != b'\n'
&& c != b')');
&& c != b')')?;
Some(&src[pos_ + 2..pos])
} else {
None

8
src/objects/inline_src.rs
View file

@ -11,15 +11,15 @@ impl<'a> InlineSrc<'a> {
starts_with!(src, "src_");
let lang = until_while!(src, 4, |c| c == b'[' || c == b'{', |c: u8| !c
.is_ascii_whitespace());
.is_ascii_whitespace())?;
if lang == 4 {
return None;
}
if src.as_bytes()[lang] == b'[' {
let option = until_while!(src, lang, b']', |c| c != b'\n');
let body = until_while!(src, option, b'}', |c| c != b'\n');
let option = until_while!(src, lang, b']', |c| c != b'\n')?;
let body = until_while!(src, option, b'}', |c| c != b'\n')?;
Some((
InlineSrc {
@ -30,7 +30,7 @@ impl<'a> InlineSrc<'a> {
body + 1,
))
} else {
let body = until_while!(src, lang, b'}', |c| c != b'\n');
let body = until_while!(src, lang, b'}', |c| c != b'\n')?;
Some((
InlineSrc {

4
src/objects/link.rs
View file

@ -11,7 +11,7 @@ impl<'a> Link<'a> {
starts_with!(src, "[[");
}
let path = until_while!(src, 2, b']', |c| c != b'<' && c != b'>' && c != b'\n');
let path = until_while!(src, 2, b']', |c| c != b'<' && c != b'>' && c != b'\n')?;
if cond_eq!(src, path + 1, b']') {
Some((
@ -22,7 +22,7 @@ impl<'a> Link<'a> {
path + 2,
))
} else if src.as_bytes()[path + 1] == b'[' {
let desc = until_while!(src, path + 2, b']', |c| c != b'[');
let desc = until_while!(src, path + 2, b']', |c| c != b'[')?;
expect!(src, desc + 1, b']')?;
Some((

4
src/objects/macros.rs
View file

@ -15,9 +15,9 @@ impl<'a> Macros<'a> {
pub fn parse(src: &'a str) -> Option<(Macros<'a>, usize)> {
starts_with!(src, "{{{");
expect!(src, 3, |c: u8| c.is_ascii_alphabetic());
expect!(src, 3, |c: u8| c.is_ascii_alphabetic())?;
let name = until_while!(src, 3, |c| c == b'}' || c == b'(', valid_name);
let name = until_while!(src, 3, |c| c == b'}' || c == b'(', valid_name)?;
if src.as_bytes()[name] == b'}' {
expect!(src, name + 1, b'}')?;

2
src/objects/snippet.rs
View file

@ -13,7 +13,7 @@ impl<'a> Snippet<'a> {
starts_with!(src, "@@");
}
let name = until_while!(src, 2, b':', |c: u8| c.is_ascii_alphanumeric() || c == b'-');
let name = until_while!(src, 2, b':', |c: u8| c.is_ascii_alphanumeric() || c == b'-')?;
if name == 2 {
return None;

12
src/objects/target.rs
View file

@ -9,11 +9,11 @@ impl<'a> RadioTarget<'a> {
starts_with!(src, "<<<");
}
expect!(src, 3, |c| c != b' ');
expect!(src, 3, |c| c != b' ')?;
let end = until_while!(src, 3, b'>', |c| c != b'<' && c != b'\n');
let end = until_while!(src, 3, b'>', |c| c != b'<' && c != b'\n')?;
expect!(src, end - 1, |c| c != b' ');
expect!(src, end - 1, |c| c != b' ')?;
expect!(src, end + 1, b'>')?;
expect!(src, end + 2, b'>')?;
@ -31,11 +31,11 @@ impl<'a> Target<'a> {
starts_with!(src, "<<");
}
expect!(src, 2, |c| c != b' ');
expect!(src, 2, |c| c != b' ')?;
let end = until_while!(src, 2, b'>', |c| c != b'<' && c != b'\n');
let end = until_while!(src, 2, b'>', |c| c != b'<' && c != b'\n')?;
expect!(src, end - 1, |c| c != b' ');
expect!(src, end - 1, |c| c != b' ')?;
expect!(src, end + 1, b'>')?;
Some((Target(&src[2..end]), end + 2))