From cfd6df7ba5de797262997dafdb4f7ab122a34bda Mon Sep 17 00:00:00 2001 From: greg Date: Sat, 24 Feb 2018 17:43:26 -0800 Subject: [PATCH] Centralize data for prefix ops too --- src/schala_lang/builtin.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/schala_lang/builtin.rs b/src/schala_lang/builtin.rs index f4076ba..ba4f133 100644 --- a/src/schala_lang/builtin.rs +++ b/src/schala_lang/builtin.rs @@ -20,18 +20,12 @@ impl BinOp { let s = self.sigil.as_str(); BINOPS.get(s).map(|x| x.0.clone()).ok_or(format!("Binop {} not found", s)) } -} - -impl BinOp { pub fn min_precedence() -> i32 { i32::min_value() } pub fn get_precedence(op: &str) -> i32 { - match op { - "+" | "-" => 10, - "*" | "/" | "%" => 20, - _ => 30, - } + let default = 10_000_000; + BINOPS.get(op).map(|x| x.2.clone()).unwrap_or(default) } } @@ -48,13 +42,18 @@ impl PrefixOp { &self.sigil } pub fn is_prefix(op: &str) -> bool { - match op { - "+" | "-" | "!" | "~" => true, - _ => false, - } + PREFIX_OPS.get(op).is_some() } } - +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 * binop definition */