major cleanups: extend Type, refactor Term, and switch to String errs

1 files changed, 2 insertions, 8 deletions

diff --git a/src/util.rs b/src/util.rs
index 5011ac7..70bd8e4 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -13,10 +13,6 @@ pub fn unique_ident(count: &mut u8) -> String {
     }
 }
 
-pub fn Term(val: Value, kind: Type) -> Term {
-    return Term {val, kind};
-}
-
 pub fn Ann(expr: Expression, kind: Type) -> Expression {
     return Expression::Annotation {
         expr: Box::new(expr),
@@ -24,10 +20,8 @@ pub fn Ann(expr: Expression, kind: Type) -> Expression {
     };
 }
 
-pub fn Const(val: Value) -> Expression {
-    return Expression::Constant {
-        term: Term {val, kind: Type::Empty}
-    };
+pub fn Const(term: Term) -> Expression {
+    return Expression::Constant { term };
 }
 
 pub fn Var(id: &str) -> Expression {