diff --git a/utils/src/pos.rs b/utils/src/pos.rs index d968b86..c68822a 100644 --- a/utils/src/pos.rs +++ b/utils/src/pos.rs @@ -21,12 +21,19 @@ pub struct Position { } #[macro_export] -macro_rules! mpos { +macro_rules! ipos { ($x:expr, $y:expr) => { $crate::pos::Position::new($x, $y) }; } +#[macro_export] +macro_rules! upos { + ($x:expr, $y:expr) => { + $crate::pos::ipos!($x as isize, $y as isize) + }; +} + #[macro_export] macro_rules! kern { @@ -39,7 +46,7 @@ macro_rules! kern { (@builtin SW) => { $crate::dir::ALL_8[6] }; (@builtin NW) => { $crate::dir::ALL_8[7] }; - (@builtin ($x:expr, $y: expr)) => { $crate::pos::pos!($x, $y) }; + (@builtin ($x:expr, $y: expr)) => { $crate::pos::upos!($x, $y) }; [$($s:tt),*] => { [$(kern!(@builtin $s),)*]