post-d-w cleanup

This commit is contained in:
ESL 2023-03-30 13:17:25 -04:00
parent a9aa80ea67
commit 623455a8e3
4 changed files with 6 additions and 13 deletions

6
i.c
View file

@ -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) { define_instruction(rck) {
/* called with continuation as rd: /* called with continuation as rd:

5
i.h
View file

@ -66,9 +66,8 @@ declare_instruction(lck0, "k0", 0, NULL,
declare_instruction(rck, "k!", 0, NULL, 0, NULL) declare_instruction(rck, "k!", 0, NULL, 0, NULL)
declare_instruction(wck, "w", 0, NULL, 0, NULL) declare_instruction(wck, "w", 0, NULL, 0, NULL)
declare_instruction(wckr, "w!", 0, NULL, 0, NULL) declare_instruction(wckr, "w!", 0, NULL, 0, NULL)
declare_instruction(dys, "y", 0, "%dynamic-state", '0', AUTOGL) declare_instruction(dys, "y", 0, NULL, 0, NULL)
declare_instruction(kdys, "y!", 0, NULL, 0, NULL) declare_instruction(setdys, "sy", 0, NULL, 0, NULL)
declare_instruction(setdys, "sy", 0, "%set-dynamic-state!", '1', AUTOGL)
declare_instruction(save, "$", 's', NULL, 0, NULL) declare_instruction(save, "$", 's', NULL, 0, NULL)
declare_instruction(push, ",", 0, NULL, 0, NULL) declare_instruction(push, ",", 0, NULL, 0, NULL)
declare_instruction(jdceq, "|", 2, NULL, 0, NULL) declare_instruction(jdceq, "|", 2, NULL, 0, NULL)

4
n.c
View file

@ -1181,7 +1181,7 @@ static void wrdatum(obj o, wenv_t *e) {
} else if (o == obj_from_void(0)) { } else if (o == obj_from_void(0)) {
wrs("#<void>", e); wrs("#<void>", e);
} else if (o == obj_from_unit()) { } else if (o == obj_from_unit()) {
wrs("#<unit>", e); wrs("#<values>", e);
} else if (isiport(o)) { } else if (isiport(o)) {
char buf[60]; sprintf(buf, "#<%s>", ckiportvt(o)->tname); wrs(buf, e); char buf[60]; sprintf(buf, "#<%s>", ckiportvt(o)->tname); wrs(buf, e);
} else if (isoport(o)) { } else if (isoport(o)) {
@ -1260,7 +1260,7 @@ static void wrdatum(obj o, wenv_t *e) {
int i, n = recordlen(o); int i, n = recordlen(o);
obj rtd = recordrtd(o); obj rtd = recordrtd(o);
if (rtd == bool_from_obj(0)) { if (rtd == bool_from_obj(0)) {
wrs("#<tuple", e); wrs("#<values", e);
} else { } else {
wrs("#<record ", e); wrdatum(rtd, e); // TODO: no need to show as shared! wrs("#<record ", e); wrdatum(rtd, e); // TODO: no need to show as shared!
} }

View file

@ -3414,7 +3414,7 @@ static void wrdatum(obj o, wenv_t *e) {
} else if (o == obj_from_void(0)) { } else if (o == obj_from_void(0)) {
wrs(\"#<void>\", e); wrs(\"#<void>\", e);
} else if (o == obj_from_unit()) { } else if (o == obj_from_unit()) {
wrs(\"#<unit>\", e); wrs(\"#<values>\", e);
} else if (isiport(o)) { } else if (isiport(o)) {
char buf[60]; sprintf(buf, \"#<%s>\", ckiportvt(o)->tname); wrs(buf, e); char buf[60]; sprintf(buf, \"#<%s>\", ckiportvt(o)->tname); wrs(buf, e);
} else if (isoport(o)) { } else if (isoport(o)) {
@ -3493,7 +3493,7 @@ static void wrdatum(obj o, wenv_t *e) {
int i, n = recordlen(o); int i, n = recordlen(o);
obj rtd = recordrtd(o); obj rtd = recordrtd(o);
if (rtd == bool_from_obj(0)) { if (rtd == bool_from_obj(0)) {
wrs(\"#<tuple\", e); wrs(\"#<values\", e);
} else { } else {
wrs(\"#<record \", e); wrdatum(rtd, e); // TODO: no need to show as shared! wrs(\"#<record \", e); wrdatum(rtd, e); // TODO: no need to show as shared!
} }