Clean up some operator code

schala-lang/language/src/builtin.rs

@@ -110,6 +110,20 @@ pub struct BinOp {
   pub builtin: Option<Builtin>,
 }
 
+fn token_kind_to_sigil<'a>(tok: &'a TokenKind) -> Option<&'a str> {
+  use self::TokenKind::*;
+  Some(match tok {
+    Operator(op) => op.as_str(),
+    Period => ".",
+    Pipe => "|",
+    Slash => "/",
+    LAngleBracket => "<",
+    RAngleBracket => ">",
+    Equals => "=",
+    _ => return None
+  })
+}
+
 impl BinOp {
   pub fn from_sigil(sigil: &str) -> BinOp {
     let builtin = Builtin::from_str(sigil).ok();
@@ -119,35 +133,15 @@ impl BinOp {
     &self.sigil
   }
   pub fn from_sigil_token(tok: &TokenKind) -> Option<BinOp> {
-    use self::TokenKind::*;
+    let s = token_kind_to_sigil(tok)?;
-    let s = match tok {
-      Operator(op) => op,
-      Period => ".",
-      Pipe => "|",
-      Slash => "/",
-      LAngleBracket => "<",
-      RAngleBracket => ">",
-      Equals => "=",
-      _ => return None
-    };
     Some(BinOp::from_sigil(s))
   }
 
   pub fn min_precedence() -> i32 {
     i32::min_value()
   }
-  pub fn get_precedence_from_token(op: &TokenKind) -> Option<i32> {
+  pub fn get_precedence_from_token(op_tok: &TokenKind) -> Option<i32> {
-    use self::TokenKind::*;
+    let s = token_kind_to_sigil(op_tok)?;
-    let s = match op {
-      Operator(op) => op,
-      Period => ".",
-      Pipe => "|",
-      Slash => "/",
-      LAngleBracket => "<",
-      RAngleBracket => ">",
-      Equals => "=",
-      _ => return None
-    };
     let default = 10_000_000;
     Some(BINOPS.get(s).map(|x| x.2.clone()).unwrap_or_else(|| {
       default