unspeaker/tengri
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tengri.git synced 2025-12-06 03:36:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

0.9.0: add get_value! and get_content! macros for dsl impl

Browse source
This commit is contained in:
🪞👃🪞 2025-04-15 18:12:40 +03:00
parent 1ad2d43d5a
commit f11c27b8c9
3 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,5 +1,5 @@
[workspace.package] [workspace.package]
version = "0.8.0" version = "0.9.0"
[workspace] [workspace]
resolver = "2" resolver = "2"

20
dsl/src/lib.rs
View file

@ -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> { //#[cfg(test)] #[test] fn test_examples () -> Result<(), ParseError> {
//// Let's pretend to render some view. //// Let's pretend to render some view.
//let source = include_str!("../../tek/src/view_arranger.edn"); //let source = include_str!("../../tek/src/view_arranger.edn");

39
output/src/ops/transform.rs
View file

@ -38,13 +38,8 @@ macro_rules! transform_xy {
if let Some(Token { value: Value::Key(k), .. }) = iter.peek() { if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
if k == $x || k == $y || k == $xy { if k == $x || k == $y || k == $xy {
let _ = iter.next().unwrap(); let _ = iter.next().unwrap();
let token = iter.next() let token = iter.next().expect("no content specified");
.expect("no content specified"); let content = get_content!(state, token);;
let content = if let Some(content) = state.get_content(&token.value) {
content
} else {
panic!("no content corresponding to for {:?}", &token);
};
return Some(match k { return Some(match k {
$x => Self::x(content), $x => Self::x(content),
$y => Self::y(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 let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
if k == $x || k == $y { if k == $x || k == $y {
let _ = iter.next().unwrap(); let _ = iter.next().unwrap();
let u = get_value!(state => iter.next().expect("no unit specified"));
let u = iter.next().expect("no unit specified"); let c = get_content!(state => iter.next().expect("no content 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);
};
return Some(match k { return Some(match k {
$x => Self::x(u, c), $x => Self::x(u, c),
$y => Self::y(u, c), $y => Self::y(u, c),
@ -108,20 +94,9 @@ macro_rules! transform_xy_unit {
}) })
} else if k == $xy { } else if k == $xy {
let _ = iter.next().unwrap(); let _ = iter.next().unwrap();
let u = get_value!(state, iter.next().expect("no unit specified"));
let u = iter.next().expect("no unit specified"); let v = get_value!(state, iter.next().expect("no unit specified"));
let u = state.get(&u.value).expect("no x unit provided"); let c = get_content!(state, iter.next().expect("no content specified"));
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);
};
return Some(Self::xy(u, v, c)) return Some(Self::xy(u, v, c))
} }
} }