refactor(parser): clean up parse functions

src/objects/macros.rs

@@ -3,36 +3,31 @@ use memchr::memchr2;
 
 /// returns (macros name, macros arguments, offset)
 #[inline]
-pub fn parse(src: &str) -> Option<(&str, Option<&str>, usize)> {
-    debug_assert!(src.starts_with("{{{"));
+pub fn parse(text: &str) -> Option<(&str, Option<&str>, usize)> {
+    debug_assert!(text.starts_with("{{{"));
 
-    expect!(src, 3, |c: u8| c.is_ascii_alphabetic())?;
+    expect!(text, 3, |c: u8| c.is_ascii_alphabetic())?;
 
-    let bytes = src.as_bytes();
-    let name = memchr2(b'}', b'(', bytes).filter(|&i| {
-        bytes[3..i]
-            .iter()
-            .all(|&c| c.is_ascii_alphanumeric() || c == b'-' || c == b'_')
-    })?;
+    let bytes = text.as_bytes();
+    let (name, off) = memchr2(b'}', b'(', bytes)
+        .filter(|&i| {
+            bytes[3..i]
+                .iter()
+                .all(|&c| c.is_ascii_alphanumeric() || c == b'-' || c == b'_')
+        })
+        .map(|i| (&text[3..i], i))?;
 
-    Some(if bytes[name] == b'}' {
-        expect!(src, name + 1, b'}')?;
-        expect!(src, name + 2, b'}')?;
-        (&src[3..name], None, name + 3)
+    let (args, off) = if bytes[off] == b'}' {
+        expect!(text, off + 1, b'}')?;
+        expect!(text, off + 2, b'}')?;
+        (None, off + 3 /* }}} */)
     } else {
-        let end = Substring::new(")}}}")
-            .find(&src[name..])
-            .map(|i| i + name)?;
-        (
-            &src[3..name],
-            if name == end {
-                None
-            } else {
-                Some(&src[name + 1..end])
-            },
-            end + 4,
-        )
-    })
+        Substring::new(")}}}")
+            .find(&text[off..])
+            .map(|i| (Some(&text[off + 1..off + i]), off + i + 4 /* )}}} */))?
+    };
+
+    Some((name, args, off))
 }
 
 #[cfg(test)]