mirror of
https://codeberg.org/unspeaker/tengri.git
synced 2025-12-06 11:46:42 +01:00
0.9.0: add get_value! and get_content! macros for dsl impl
This commit is contained in:
parent
1ad2d43d5a
commit
f11c27b8c9
3 changed files with 28 additions and 33 deletions
|
|
@ -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))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue