Centralize data for prefix ops too

This commit is contained in:
greg 2018-02-24 17:43:26 -08:00
parent d3ef980dc5
commit a396c448ec

View File

@ -20,18 +20,12 @@ impl BinOp {
let s = self.sigil.as_str(); let s = self.sigil.as_str();
BINOPS.get(s).map(|x| x.0.clone()).ok_or(format!("Binop {} not found", s)) BINOPS.get(s).map(|x| x.0.clone()).ok_or(format!("Binop {} not found", s))
} }
}
impl BinOp {
pub fn min_precedence() -> i32 { pub fn min_precedence() -> i32 {
i32::min_value() i32::min_value()
} }
pub fn get_precedence(op: &str) -> i32 { pub fn get_precedence(op: &str) -> i32 {
match op { let default = 10_000_000;
"+" | "-" => 10, BINOPS.get(op).map(|x| x.2.clone()).unwrap_or(default)
"*" | "/" | "%" => 20,
_ => 30,
}
} }
} }
@ -48,14 +42,19 @@ impl PrefixOp {
&self.sigil &self.sigil
} }
pub fn is_prefix(op: &str) -> bool { pub fn is_prefix(op: &str) -> bool {
match op { PREFIX_OPS.get(op).is_some()
"+" | "-" | "!" | "~" => true,
_ => false,
} }
} }
lazy_static! {
static ref PREFIX_OPS: HashMap<&'static str, (Type, ())> =
hashmap! {
"+" => (Func(bx!(Const(Int)), bx!(Const(Int))), ()),
"-" => (Func(bx!(Const(Int)), bx!(Const(Int))), ()),
"!" => (Func(bx!(Const(Bool)), bx!(Const(Bool))), ()),
"~" => (Func(bx!(Const(Int)), bx!(Const(Int))), ()),
};
} }
/* the second tuple member is a placeholder for when I want to make evaluation rules tied to the /* the second tuple member is a placeholder for when I want to make evaluation rules tied to the
* binop definition */ * binop definition */
lazy_static! { lazy_static! {