From fecbbec2d8d24639d4178f92fe0585d777165250 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Wed, 24 Nov 2021 09:07:21 +0200
Subject: Improve builtin output formatting

---
 src/runtime.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/runtime.rs')

diff --git a/src/runtime.rs b/src/runtime.rs
index 84f1820..9612659 100644
--- a/src/runtime.rs
+++ b/src/runtime.rs
@@ -27,7 +27,7 @@ pub enum Term {
     Application(Rc<Term>, Rc<Term>),
     Primitive(Value),
     Lazy(String),
-    Builtin(String, Vec<Value>),
+    Builtin(builtins::Builtin),
 }
 
 impl Term {
@@ -40,7 +40,7 @@ impl Term {
                 Value::Integer(int_val) => format!("{}Integer({})", indent_str, int_val),
                 Value::String(str_val) => format!("{}String({})", indent_str, str_val),
             },
-            Term::Builtin(symbol, _) => format!("{}Builtin({})", indent_str, symbol),
+            Term::Builtin(builtin) => format!("{}{}", indent_str, builtin),
             Term::Abstraction(v, body) => format!(
                 "{}Abstraction({})\n{}",
                 indent_str,
@@ -137,9 +137,7 @@ pub fn reduce_term(
                     &Some((*abs_v, subst_rhs_rc)),
                     resolve_lazy,
                 ),
-                Term::Builtin(symbol, bound_arguments) => {
-                    builtins::evaluate_builtin(symbol, bound_arguments, subst_rhs_rc)
-                }
+                Term::Builtin(builtin) => builtins::evaluate_builtin(builtin, subst_rhs_rc),
                 _ => Ok((
                     Rc::new(Term::Application(subst_lhs_rc, subst_rhs_rc)),
                     subst_n,
@@ -157,7 +155,7 @@ pub fn reduce_term(
             )?;
             Ok((Rc::new(Term::Abstraction(*abs_v, subst_body)), subst_n))
         }
-        Term::Builtin(_, _) => Ok((term_rc, 0)),
+        Term::Builtin(_) => Ok((term_rc, 0)),
         // Term::Lazy(symbol) => {
         //     if resolve_lazy {
         //         let table_lookup_value = symbol_table.get(symbol);
-- 
cgit v1.3