1 files changed, 21 insertions, 12 deletions

diff --git a/src/lex.rs b/src/lex.rs
index 0f9a535..701009a 100644
--- a/src/lex.rs
+++ b/src/lex.rs
@@ -1,5 +1,6 @@
 use crate::utils::FromStaticStr;
 
+#[derive(Debug)]
 pub enum Stanza {
     Entry(&'static str),
     Defn(&'static str),
@@ -11,7 +12,8 @@ pub enum Stanza {
 
 impl Stanza {
     fn is_entry(s: &str) -> bool {
-        s.chars().all(|c| c.is_uppercase() || c.is_ascii_whitespace() || "-;'.".contains(c))
+        s.chars()
+            .all(|c| c.is_uppercase() || c.is_ascii_whitespace() || "-;'.".contains(c))
     }
 
     fn is_defn(s: &str) -> bool {
@@ -27,7 +29,9 @@ impl Stanza {
     }
 
     fn is_bullet(s: &str) -> bool {
-        s.find('.').map(|idx| s[..idx].chars().all(char::is_numeric)).unwrap_or_default()
+        s.find('.')
+            .map(|idx| s[..idx].chars().all(char::is_numeric))
+            .unwrap_or_default()
     }
 
     fn is_sub_bullet(s: &str) -> bool {
@@ -49,21 +53,23 @@ impl FromStaticStr for Stanza {
         if let Some(first_line) = lines.next() {
             if !first_line.is_empty() {
                 if Stanza::is_entry(first_line) {
-                    Ok(Self::Entry(s))
+                    Ok(Self::Entry(first_line.trim()))
                 } else if Stanza::is_defn(first_line) {
-                    Ok(Self::Defn(s))
+                    Ok(Self::Defn(s.strip_prefix("Defn: ").unwrap_or(s).trim()))
                 } else if Stanza::is_note(first_line) {
-                    Ok(Self::Note(s))
+                    Ok(Self::Note(s.strip_prefix("Note: ").unwrap_or(s).trim()))
                 } else if Stanza::is_synonym(first_line) {
-                    Ok(Self::Synonym(s))
+                    Ok(Self::Synonym(s.strip_prefix("Syn.").unwrap_or(s)))
                 } else if Stanza::is_bullet(first_line) {
-                    Ok(Self::Bullet(s))
-                } else if Stanza::is_sub_bullet(first_line) {
-                    Ok(Self::SubBullet(s))
+                    Ok(Self::Defn(
+                        s.trim_start_matches(|c| "0123456789. ".contains(c)),
+                    ))
+                // } else if Stanza::is_sub_bullet(first_line) {
+                //     Ok(Self::SubBullet(s))
                 } else {
-                Err(Self::Err {
-                    data: format!("weird stanza: {}", s),
-                })
+                    Err(Self::Err {
+                        data: format!("weird stanza: {}", s),
+                    })
                 }
             } else {
                 Err(Self::Err {
@@ -78,3 +84,6 @@ impl FromStaticStr for Stanza {
     }
 }
 
+pub fn lex(src: &'static str) -> impl Iterator<Item = Result<Stanza, StanzaLexError>> {
+    src.split("\n\n").map(Stanza::from_str)
+}