From 4f70be1c32bf0997ca0897c71f901b1c2fdf225a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 16 Nov 2019 23:02:33 +0100
Subject: [PATCH] variable: display: WIP

---
 mes/module/mes/display.mes | 5 ++++-
 src/lib.c                  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mes/module/mes/display.mes b/mes/module/mes/display.mes
index e3bbf58e..3bbc25e3 100644
--- a/mes/module/mes/display.mes
+++ b/mes/module/mes/display.mes
@@ -125,7 +125,10 @@
         (display ">" port))
        ((variable? x)
         (display "#<variable " port)
-        (write (list->string (car (core:car x))) port)
+        (if (pair? (core:car x)) (display (car (core:car x)) port)
+            (begin
+              (display "value: " port)
+              (display (core:car x) port)))
         (display ">" port))
        ((number? x)
         (display (number->string x) port))
diff --git a/src/lib.c b/src/lib.c
index 1fdc6b7b..245ae376 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -39,7 +39,7 @@ struct scm *
 car_ (struct scm *x)
 {
   struct scm *a = x->car;
-  if (x->type == TPAIR)
+  if (x->type == TPAIR || x->type == TCLOSURE || x->type == TVARIABLE)
     return a;
   return make_number (cast_scmp_to_long (a));
 }