From f11c27b8c9903faffce2f765c535af918abc7cdb Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Tue, 15 Apr 2025 18:12:40 +0300
Subject: [PATCH] 0.9.0: add get_value! and get_content! macros for dsl impl

---
 Cargo.toml                  |  2 +-
 dsl/src/lib.rs              | 20 +++++++++++++++++++
 output/src/ops/transform.rs | 39 +++++++------------------------------
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ae648af..a30f6c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.8.0"
+version = "0.9.0"
 
 [workspace]
 resolver = "2"
diff --git a/dsl/src/lib.rs b/dsl/src/lib.rs
index 27b542c..04d234a 100644
--- a/dsl/src/lib.rs
+++ b/dsl/src/lib.rs
@@ -67,6 +67,26 @@ pub(crate) use std::fmt::Debug;
     };
 }
 
+#[macro_export] macro_rules! get_value {
+    ($state:expr => $token:expr) => {
+        if let Some(value) = $state.get(&$token.value) {
+            value
+        } else {
+            panic!("no value corresponding to for {:?}", &$token.value);
+        }
+    }
+}
+
+#[macro_export] macro_rules! get_content {
+    ($state:expr => $token:expr) => {
+        if let Some(content) = $state.get_content(&$token.value) {
+            content
+        } else {
+            panic!("no content corresponding to for {:?}", &$token.value);
+        }
+    }
+}
+
 //#[cfg(test)] #[test] fn test_examples () -> Result<(), ParseError> {    
     //// Let's pretend to render some view.
     //let source = include_str!("../../tek/src/view_arranger.edn");
diff --git a/output/src/ops/transform.rs b/output/src/ops/transform.rs
index 3dd5b6e..25afd43 100644
--- a/output/src/ops/transform.rs
+++ b/output/src/ops/transform.rs
@@ -38,13 +38,8 @@ macro_rules! transform_xy {
                 if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
                     if k == $x || k == $y || k == $xy {
                         let _ = iter.next().unwrap();
-                        let token = iter.next()
-                            .expect("no content specified");
-                        let content = if let Some(content) = state.get_content(&token.value) {
-                            content
-                        } else {
-                            panic!("no content corresponding to for {:?}", &token);
-                        };
+                        let token = iter.next().expect("no content specified");
+                        let content = get_content!(state, token);;
                         return Some(match k {
                             $x => Self::x(content),
                             $y => Self::y(content),
@@ -90,17 +85,8 @@ macro_rules! transform_xy_unit {
                 if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
                     if k == $x || k == $y {
                         let _ = iter.next().unwrap();
-
-                        let u = iter.next().expect("no unit specified");
-                        let u = state.get(&u.value).expect("no unit provided");
-
-                        let c = iter.next().expect("no content specified");
-                        let c = if let Some(c) = state.get_content(&c.value) {
-                            c
-                        } else {
-                            panic!("no content corresponding to {:?}", &c);
-                        };
-
+                        let u = get_value!(state => iter.next().expect("no unit specified"));
+                        let c = get_content!(state => iter.next().expect("no content specified"));
                         return Some(match k {
                             $x => Self::x(u, c),
                             $y => Self::y(u, c),
@@ -108,20 +94,9 @@ macro_rules! transform_xy_unit {
                         })
                     } else if k == $xy {
                         let _ = iter.next().unwrap();
-
-                        let u = iter.next().expect("no unit specified");
-                        let u = state.get(&u.value).expect("no x unit provided");
-
-                        let v = iter.next().expect("no unit specified");
-                        let v = state.get(&v.value).expect("no y unit provided");
-
-                        let c = iter.next().expect("no content specified");
-                        let c = if let Some(c) = state.get_content(&c.value) {
-                            c
-                        } else {
-                            panic!("no content corresponding to {:?}", &c);
-                        };
-
+                        let u = get_value!(state, iter.next().expect("no unit specified"));
+                        let v = get_value!(state, iter.next().expect("no unit specified"));
+                        let c = get_content!(state, iter.next().expect("no content specified"));
                         return Some(Self::xy(u, v, c))
                     }
                 }