From 623455a8e3311935dd9e20bdb8c25b1a2fb7e07b Mon Sep 17 00:00:00 2001
From: ESL <der.magen@hotmail.com>
Date: Thu, 30 Mar 2023 13:17:25 -0400
Subject: [PATCH] post-d-w cleanup

---
 i.c      | 6 ------
 i.h      | 5 ++---
 n.c      | 4 ++--
 src/n.sf | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/i.c b/i.c
index 16021cc..a33bf16 100644
--- a/i.c
+++ b/i.c
@@ -840,12 +840,6 @@ define_instruction(wckr) {
   }
 }
 
-define_instruction(kdys) {
-  /* called with continuation as rd:
-   * rd[0] adapter_code, rd[1] dynamic_state */
-  ac = vmcloref(rd, 1);
-  gonexti();
-}
 
 define_instruction(rck) {
   /* called with continuation as rd: 
diff --git a/i.h b/i.h
index 1048344..5cd0254 100644
--- a/i.h
+++ b/i.h
@@ -66,9 +66,8 @@ declare_instruction(lck0,       "k0",           0,  NULL,
 declare_instruction(rck,        "k!",           0,  NULL,                        0,  NULL)
 declare_instruction(wck,        "w",            0,  NULL,                        0,  NULL)
 declare_instruction(wckr,       "w!",           0,  NULL,                        0,  NULL)
-declare_instruction(dys,        "y",            0,  "%dynamic-state",           '0', AUTOGL)
-declare_instruction(kdys,       "y!",           0,  NULL,                        0,  NULL)
-declare_instruction(setdys,     "sy",           0,  "%set-dynamic-state!",      '1', AUTOGL)
+declare_instruction(dys,        "y",            0,  NULL,                        0,  NULL)
+declare_instruction(setdys,     "sy",           0,  NULL,                        0,  NULL)
 declare_instruction(save,       "$",           's', NULL,                        0,  NULL)
 declare_instruction(push,       ",",            0,  NULL,                        0,  NULL) 
 declare_instruction(jdceq,      "|",            2,  NULL,                        0,  NULL)  
diff --git a/n.c b/n.c
index 8b52096..520f96f 100644
--- a/n.c
+++ b/n.c
@@ -1181,7 +1181,7 @@ static void wrdatum(obj o, wenv_t *e) {
   } else if (o == obj_from_void(0)) {
     wrs("#<void>", e);
   } else if (o == obj_from_unit()) {
-    wrs("#<unit>", e);
+    wrs("#<values>", e);
   } else if (isiport(o)) {
     char buf[60]; sprintf(buf, "#<%s>", ckiportvt(o)->tname); wrs(buf, e);
   } else if (isoport(o)) {
@@ -1260,7 +1260,7 @@ static void wrdatum(obj o, wenv_t *e) {
     int i, n = recordlen(o);
     obj rtd = recordrtd(o);
     if (rtd == bool_from_obj(0)) {
-      wrs("#<tuple", e);
+      wrs("#<values", e);
     } else {
       wrs("#<record ", e); wrdatum(rtd, e); // TODO: no need to show as shared!
     }
diff --git a/src/n.sf b/src/n.sf
index 663a0ce..17a9d16 100644
--- a/src/n.sf
+++ b/src/n.sf
@@ -3414,7 +3414,7 @@ static void wrdatum(obj o, wenv_t *e) {
   } else if (o == obj_from_void(0)) {
     wrs(\"#<void>\", e);
   } else if (o == obj_from_unit()) {
-    wrs(\"#<unit>\", e);
+    wrs(\"#<values>\", e);
   } else if (isiport(o)) {
     char buf[60]; sprintf(buf, \"#<%s>\", ckiportvt(o)->tname); wrs(buf, e);
   } else if (isoport(o)) {
@@ -3493,7 +3493,7 @@ static void wrdatum(obj o, wenv_t *e) {
     int i, n = recordlen(o);
     obj rtd = recordrtd(o);
     if (rtd == bool_from_obj(0)) {
-      wrs(\"#<tuple\", e);
+      wrs(\"#<values\", e);
     } else {
       wrs(\"#<record \", e); wrdatum(rtd, e); // TODO: no need to show as shared!
     }