Roorganized into workspace and packages.

This is to accomidate a new proc_macro package, which can't have
anything else in it.

13 files changed, 126 insertions, 5 deletions

diff --git a/Cargo.lock b/Cargo.lock
index f7e6686..842949d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,3 +5,10 @@ version = 4
 [[package]]
 name = "crimtag"
 version = "0.1.0"
+
+[[package]]
+name = "derive"
+version = "0.1.0"
+dependencies = [
+ "crimtag",
+]
diff --git a/Cargo.toml b/Cargo.toml
index ee022ca..a20cdc3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
-[package]
-name = "crimtag"
-version = "0.1.0"
-edition = "2024"
+[workspace]
+members = ["derive","crimtag"]
+default-members = ["derive","crimtag"]
+resolver = "3"
 
-[dependencies]
+[workspace.dependencies]
+crimtag = { path = "crimtag"}
diff --git a/crimtag/Cargo.lock b/crimtag/Cargo.lock
new file mode 100644
index 0000000..f7e6686
--- /dev/null
+++ b/crimtag/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "crimtag"
+version = "0.1.0"
diff --git a/crimtag/Cargo.toml b/crimtag/Cargo.toml
new file mode 100644
index 0000000..ee022ca
--- /dev/null
+++ b/crimtag/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "crimtag"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
diff --git a/src/context.rs b/crimtag/src/context.rs
index 6f8e04f..6f8e04f 100644
--- a/src/context.rs
+++ b/crimtag/src/context.rs
diff --git a/src/error.rs b/crimtag/src/error.rs
index bbb5d6f..bbb5d6f 100644
--- a/src/error.rs
+++ b/crimtag/src/error.rs
diff --git a/src/lexer.rs b/crimtag/src/lexer.rs
index d4d39e9..d4d39e9 100644
--- a/src/lexer.rs
+++ b/crimtag/src/lexer.rs
diff --git a/src/lib.rs b/crimtag/src/lib.rs
index e8f9e9f..e8f9e9f 100644
--- a/src/lib.rs
+++ b/crimtag/src/lib.rs
diff --git a/src/parser.rs b/crimtag/src/parser.rs
index 4f7ff6a..4f7ff6a 100644
--- a/src/parser.rs
+++ b/crimtag/src/parser.rs
diff --git a/src/position.rs b/crimtag/src/position.rs
index 24f5309..24f5309 100644
--- a/src/position.rs
+++ b/crimtag/src/position.rs
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
new file mode 100644
index 0000000..65f3a75
--- /dev/null
+++ b/derive/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "derive"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+proc-macro = true
+
+[dev-dependencies]
+crimtag = { path = "../crimtag"}
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
new file mode 100644
index 0000000..f9c9180
--- /dev/null
+++ b/derive/src/lib.rs
@@ -0,0 +1,75 @@
+extern crate proc_macro;
+use proc_macro::{TokenStream,TokenTree,Ident,Delimiter};
+
+#[proc_macro_derive(CrimtagMappable)]
+pub fn derive_crimtag_mappable(s: TokenStream) -> TokenStream {
+    let mut i = s.into_iter();
+    while let Some(t) = i.next() {
+        if let TokenTree::Ident(ident) = t &&
+            ident.to_string() == "struct" {
+            break;
+        }
+    }
+    let name = if let Some(TokenTree::Ident(ident)) = i.next() {
+        ident.to_string()
+    } else {
+        panic!("No name found in struct.");
+    };
+
+    // TODO: Expand this to include the generic parameters and the where? at
+    // least the parameters.
+    println!("struct name: {:?}", name);
+
+    let mut newfunc = format!(
+r#"impl<'a> crimtag::MappedStructure<'a> for {} {{
+    fn get_value(&'a self, id: &str) -> Option<MappedValue<'a>> {{
+        match id {{
+"#, name);
+
+    // We're going to cheat. Every field name is followed directly by a colon,
+    // so all we really need to do is hunt for colons and then take the
+    // previous item.
+
+    while let Some(n) = i.next() {
+        if let TokenTree::Group(g) = &n &&
+            g.delimiter() == Delimiter::Brace {
+            // Operate on the struct members.
+            let mut gi = g.stream().into_iter();
+            let mut cur = 0usize;
+            let mut tok = [gi.next(), gi.next()];
+            loop {
+                if let Some(TokenTree::Punct(ch)) = &tok[(cur+1)%2] &&
+                    ch.as_char() == ':' &&
+                    let Some(TokenTree::Ident(id)) = &tok[cur] {
+                    println!("!!!!!!!!!! -> {}", id);
+                    newfunc.push_str(&format!(
+r#"            "{}" => Some(self.{}.into()),
+"#, id, id));
+                }
+                println!(" - {:?} {:?}", tok[cur], tok[(cur+1)%2] );
+                // Update next.
+                if let Some(ni) = gi.next() {
+                    tok[cur].replace( ni );
+                    cur = (cur+1)%2;
+                } else {
+                    break;
+                }
+            }
+        }
+    }
+    
+    newfunc.push_str(
+r#"            _ => None,
+        }
+    }
+}"#);
+
+    println!();
+    println!();
+    println!("{}", newfunc);
+    println!();
+    println!();
+
+    newfunc.parse().unwrap()
+}
+
diff --git a/derive/tests/basic.rs b/derive/tests/basic.rs
new file mode 100644
index 0000000..18fc366
--- /dev/null
+++ b/derive/tests/basic.rs
@@ -0,0 +1,15 @@
+use derive::*;
+use crimtag::*;
+
+#[derive(CrimtagMappable)]
+pub struct Test {
+    number: i32,
+    something: f64,
+    inner_thing: String,
+}
+
+
+
+#[test]
+fn it_works() {
+}