From 5141cdadd99d6106c855b58d2e6e6576f56a6041 Mon Sep 17 00:00:00 2001
From: Greg Shuflin <greg@everydayimshuflin.com>
Date: Tue, 30 Jan 2024 00:03:02 -0800
Subject: [PATCH] Generalized to AnnotatedParser

---
 src/annotated.rs | 45 +++++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs       |  1 +
 src/parser.rs    | 34 +++-------------------------------
 3 files changed, 49 insertions(+), 31 deletions(-)
 create mode 100644 src/annotated.rs

diff --git a/src/annotated.rs b/src/annotated.rs
new file mode 100644
index 0000000..9a0e07e
--- /dev/null
+++ b/src/annotated.rs
@@ -0,0 +1,45 @@
+use std::marker::PhantomData;
+
+use crate::{ParseResult, Parser};
+
+pub struct AnnotatedParser<P, I, O, E>
+where
+    P: Parser<I, O, E>,
+{
+    inner: P,
+    name: Option<String>,
+    phantom: PhantomData<(I, O, E)>,
+}
+
+impl<P, I, O, E> Parser<I, O, E> for AnnotatedParser<P, I, O, E>
+where
+    P: Parser<I, O, E>,
+{
+    fn parse(&self, input: I) -> ParseResult<I, O, E> {
+        self.inner.parse(input)
+    }
+
+    fn name(&self) -> Option<String> {
+        self.name.clone()
+    }
+}
+
+impl<P, I, O, E> AnnotatedParser<P, I, O, E>
+where
+    P: Parser<I, O, E>,
+{
+    pub fn new(inner: P) -> Self {
+        Self {
+            inner,
+            name: None,
+            phantom: PhantomData,
+        }
+    }
+
+    pub fn with_name(self, name: &str) -> Self {
+        Self {
+            name: Some(name.to_string()),
+            ..self
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index bfe9e72..681a09f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
 #![allow(dead_code)] //TODO eventually turn this off
+mod annotated;
 mod choice;
 mod combinators;
 mod map;
diff --git a/src/parser.rs b/src/parser.rs
index 1675d63..2b4f9cf 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1,6 +1,4 @@
-use std::marker::PhantomData;
-
-use crate::{map, seq2, surrounded_by};
+use crate::{annotated::AnnotatedParser, map, seq2, surrounded_by};
 
 pub type ParseResult<I, O, E> = Result<(O, I), (E, I)>;
 
@@ -20,28 +18,6 @@ where
     }
 }
 
-pub struct NamedParser<P, I, O, E>
-where
-    P: Parser<I, O, E>,
-{
-    inner: P,
-    name: String,
-    phantom: PhantomData<(I, O, E)>,
-}
-
-impl<P, I, O, E> Parser<I, O, E> for NamedParser<P, I, O, E>
-where
-    P: Parser<I, O, E>,
-{
-    fn parse(&self, input: I) -> ParseResult<I, O, E> {
-        self.inner.parse(input)
-    }
-
-    fn name(&self) -> Option<String> {
-        Some(self.name.clone())
-    }
-}
-
 pub trait ParserExtension<I, O, E>: Parser<I, O, E> {
     fn map<F, O2>(self, map_fn: F) -> impl Parser<I, O2, E>
     where
@@ -52,15 +28,11 @@ pub trait ParserExtension<I, O, E>: Parser<I, O, E> {
     fn then_ignore<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, O, E>;
     fn ignore_then<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, O2, E>;
     fn surrounded_by<O2>(self, surrounding: impl Parser<I, O2, E>) -> impl Parser<I, O, E>;
-    fn to_named(self, name: &str) -> NamedParser<Self, I, O, E>
+    fn to_named(self, name: &str) -> AnnotatedParser<Self, I, O, E>
     where
         Self: Sized,
     {
-        NamedParser {
-            inner: self,
-            name: name.to_string(),
-            phantom: PhantomData,
-        }
+        AnnotatedParser::new(self).with_name(name)
     }
 }