From caffa621de428b238d6c0d7b18b76e2750128f29 Mon Sep 17 00:00:00 2001
From: nils <48135649+Nilstrieb@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:45:17 +0200
Subject: [PATCH] new parser passes old tests

---
 mono-fmt-macro/src/lib.rs    | 50 ++++++++++++++++++++++++++++++++++--
 mono-fmt-macro/src/parser.rs |  4 +--
 src/lib.rs                   |  1 -
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/mono-fmt-macro/src/lib.rs b/mono-fmt-macro/src/lib.rs
index 4fb3672..53904f3 100644
--- a/mono-fmt-macro/src/lib.rs
+++ b/mono-fmt-macro/src/lib.rs
@@ -1,6 +1,6 @@
 use std::str::Chars;
 
-use parser::{Error, FmtSpec};
+use parser::{Alignment, Error, FmtSpec, FmtType};
 use peekmore::{PeekMore, PeekMoreIterator};
 use proc_macro::TokenStream;
 use proc_macro2::Span;
@@ -93,6 +93,7 @@ where
         while let Some(char) = self.string.next() {
             match char {
                 '{' => {
+                    self.save_string(std::mem::take(&mut next_string));
                     let argument = self.fmt_spec()?;
                     let expr = self.expect_expr();
                     self.fmt_parts.push(FmtPart::Spec(argument, expr));
@@ -120,6 +121,16 @@ where
     }
 }
 
+impl ToTokens for Alignment {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        tokens.extend(match self {
+            Self::Center => quote! { WithCenterAlign },
+            Self::Left => quote! { WithLeftAlign },
+            Self::Right => quote! { WithRightAlign },
+        })
+    }
+}
+
 impl ToTokens for FmtPart {
     fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
         let own_tokens = match self {
@@ -127,7 +138,42 @@ impl ToTokens for FmtPart {
                 let literal = LitStr::new(lit, Span::call_site());
                 quote! { ::mono_fmt::_private::Str(#literal) }
             }
-            FmtPart::Spec(_, _) => todo!(),
+            FmtPart::Spec(spec, expr) => {
+                let mut tokens = expr.to_token_stream();
+                if let Some(align) = &spec.align {
+                    if let Some(fill) = align.fill {
+                        tokens = quote! { ::mono_fmt::_private::WithFill::<_, #fill>(#tokens) };
+                    }
+                    let alignment = align.kind;
+                    tokens = quote! { ::mono_fmt::_private::#alignment(#tokens) };
+                }
+
+                if spec.alternate {
+                    tokens = quote! { ::mono_fmt::_private::WithAlternate(#tokens) };
+                }
+
+                if spec.zero {
+                    todo!()
+                }
+
+                if let Some(_) = spec.width {
+                    todo!()
+                }
+
+                if let Some(_) = spec.precision {
+                    todo!()
+                }
+
+                match spec.kind {
+                    FmtType::Default => quote! {
+                        ::mono_fmt::_private::DisplayArg(#tokens)
+                    },
+                    FmtType::Debug => quote! {
+                        ::mono_fmt::_private::DebugArg(#tokens)
+                    },
+                    _ => todo!(),
+                }
+            }
         };
 
         tokens.extend(own_tokens);
diff --git a/mono-fmt-macro/src/parser.rs b/mono-fmt-macro/src/parser.rs
index dc67189..cf0638f 100644
--- a/mono-fmt-macro/src/parser.rs
+++ b/mono-fmt-macro/src/parser.rs
@@ -15,7 +15,7 @@ impl Error {
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Alignment {
     Left,
     Center,
@@ -33,7 +33,7 @@ impl Alignment {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Align {
     pub kind: Alignment,
     pub fill: Option<char>,
diff --git a/src/lib.rs b/src/lib.rs
index 7a52cab..5ac0375 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,6 @@
 #![allow(dead_code)]
 
 // for the test macro expansion
-#[cfg(test)]
 extern crate self as mono_fmt;
 
 mod args;