mirror of
https://codeberg.org/unspeaker/tengri.git
synced 2025-12-07 12:16:44 +01:00
0.7.1: log unresolved content in all cases
This commit is contained in:
parent
f33f331a48
commit
34295570a2
7 changed files with 70 additions and 39 deletions
|
|
@ -90,10 +90,17 @@ 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 c = iter.next().expect("no content specified");
|
||||
let u = state.get(&u.value).expect("no unit provided");
|
||||
let c = state.get_content(&c.value).expect("no content 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 {
|
||||
$x => Self::x(u, c),
|
||||
$y => Self::y(u, c),
|
||||
|
|
@ -101,12 +108,20 @@ 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 u = state.get(&u.value).expect("no unit provided");
|
||||
let v = state.get(&v.value).expect("no unit provided");
|
||||
let c = state.get_content(&c.value).expect("no content provided");
|
||||
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))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue