Merge pull request #15 from Lurk/message

Message node and pattern state machine overhaul.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yamd"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Yet Another Markdown (flavor)"

src/nodes/anchor.rs

@@ -1,10 +1,7 @@
 use crate::{
     toolkit::context::Context,
     toolkit::deserializer::Deserializer,
-    toolkit::{
-        node::Node,
-        tokenizer::{Matcher, Quantifiers::Once},
-    },
+    toolkit::{matcher::Matcher, node::Node, pattern::Quantifiers::*},
 };
 
 /// Representation of an anchor

src/nodes/bold.rs

@@ -5,8 +5,9 @@ use crate::{
     toolkit::{
         context::Context,
         deserializer::{Branch, DefinitelyNode, Deserializer, MaybeNode},
+        matcher::Matcher,
         node::Node,
-        tokenizer::{Matcher, Quantifiers::Once},
+        pattern::Quantifiers::*,
     },
 };
 

src/nodes/code.rs

@@ -1,11 +1,6 @@
 use crate::toolkit::{
-    context::Context,
-    deserializer::Deserializer,
-    node::Node,
-    tokenizer::{
-        Matcher,
-        Quantifiers::{Once, RepeatTimes},
-    },
+    context::Context, deserializer::Deserializer, matcher::Matcher, node::Node,
+    pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]

src/nodes/divider.rs

@@ -1,8 +1,6 @@
 use crate::toolkit::{
-    context::Context,
-    deserializer::Deserializer,
-    node::Node,
-    tokenizer::{Matcher, Quantifiers::RepeatTimes},
+    context::Context, deserializer::Deserializer, matcher::Matcher, node::Node,
+    pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]

src/nodes/embed.rs

@@ -1,7 +1,5 @@
 use crate::toolkit::{
-    deserializer::Deserializer,
-    node::Node,
-    tokenizer::{Matcher, Quantifiers::RepeatTimes},
+    deserializer::Deserializer, matcher::Matcher, node::Node, pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]

src/nodes/heading.rs

@@ -1,8 +1,6 @@
 use crate::toolkit::{
-    context::Context,
-    deserializer::Deserializer,
-    node::Node,
-    tokenizer::{Matcher, Quantifiers::Once, Quantifiers::RepeatTimes},
+    context::Context, deserializer::Deserializer, matcher::Matcher, node::Node,
+    pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]
@@ -30,20 +28,20 @@ impl Heading {
 impl Deserializer for Heading {
     fn deserialize_with_context(input: &str, _: Option<Context>) -> Option<Self> {
         let start_tokens = [
-            [Once('#'), Once(' ')],
-            [RepeatTimes(2, '#'), Once(' ')],
-            [RepeatTimes(3, '#'), Once(' ')],
-            [RepeatTimes(4, '#'), Once(' ')],
-            [RepeatTimes(5, '#'), Once(' ')],
             [RepeatTimes(6, '#'), Once(' ')],
+            [RepeatTimes(5, '#'), Once(' ')],
+            [RepeatTimes(4, '#'), Once(' ')],
+            [RepeatTimes(3, '#'), Once(' ')],
+            [RepeatTimes(2, '#'), Once(' ')],
+            [Once('#'), Once(' ')],
         ];
 
         for (i, start_token) in start_tokens.iter().enumerate() {
             let mut matcher = Matcher::new(input);
             if let Some(heading) = matcher.get_match(start_token, &[RepeatTimes(2, '\n')], true) {
                 return Some(Self::new(
                     heading.body,
-                    (i + 1).try_into().unwrap_or(1),
+                    (start_tokens.len() - i).try_into().unwrap_or(1),
                     heading.end_token.is_empty(),
                 ));
             }

src/nodes/highlight.rs

@@ -1,11 +1,9 @@
 use crate::toolkit::{
     context::Context,
     deserializer::{Branch, DefinitelyNode, Deserializer, MaybeNode},
+    matcher::Matcher,
     node::Node,
-    tokenizer::{
-        Matcher,
-        Quantifiers::{Once, RepeatTimes},
-    },
+    pattern::Quantifiers::*,
 };
 
 use super::paragraph::Paragraph;

src/nodes/image.rs

@@ -1,8 +1,6 @@
 use crate::toolkit::{
-    context::Context,
-    deserializer::Deserializer,
-    node::Node,
-    tokenizer::{Matcher, Quantifiers::Once},
+    context::Context, deserializer::Deserializer, matcher::Matcher, node::Node,
+    pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]

src/nodes/image_gallery.rs

@@ -1,11 +1,9 @@
 use crate::toolkit::{
     context::Context,
     deserializer::{Branch, DefinitelyNode, Deserializer, MaybeNode},
+    matcher::Matcher,
     node::Node,
-    tokenizer::{
-        Matcher,
-        Quantifiers::{Once, RepeatTimes},
-    },
+    pattern::Quantifiers::*,
 };
 
 use super::image::Image;

src/nodes/inline_code.rs

@@ -1,7 +1,6 @@
-use crate::{
-    toolkit::context::Context,
-    toolkit::tokenizer::{Matcher, Quantifiers::Once},
-    toolkit::{deserializer::Deserializer, node::Node},
+use crate::toolkit::{
+    context::Context, deserializer::Deserializer, matcher::Matcher, node::Node,
+    pattern::Quantifiers::*,
 };
 
 #[derive(Debug, PartialEq)]

src/nodes/italic.rs

@@ -1,9 +1,6 @@
 use crate::{
     toolkit::{context::Context, deserializer::Deserializer},
-    toolkit::{
-        node::Node,
-        tokenizer::{Matcher, Quantifiers::Once},
-    },
+    toolkit::{matcher::Matcher, node::Node, pattern::Quantifiers::*},
 };
 
 /// Representation of an Italic text

src/nodes/list.rs

@@ -1,11 +1,9 @@
 use crate::toolkit::{
     context::Context,
     deserializer::{Branch, DefinitelyNode, Deserializer, MaybeNode},
+    matcher::Matcher,
     node::Node,
-    tokenizer::{
-        Matcher,
-        Quantifiers::{Once, RepeatTimes, ZeroOrMore},
-    },
+    pattern::Quantifiers::*,
 };
 
 use super::list_item::ListItem;

src/nodes/list_item.rs

@@ -1,11 +1,9 @@
 use crate::toolkit::{
     context::Context,
     deserializer::{Branch, DefinitelyNode, Deserializer, FallbackNode, MaybeNode},
+    matcher::Matcher,
     node::Node,
-    tokenizer::{
-        Matcher,
-        Quantifiers::{Once, RepeatTimes, ZeroOrMore},
-    },
+    pattern::Quantifiers::*,
 };
 
 use super::{