summaryrefslogtreecommitdiff
path: root/src/scheme/ao_scheme_cons.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-12-19 11:51:33 -0800
committerKeith Packard <keithp@keithp.com>2017-12-19 11:51:33 -0800
commit34f998d147d08e966daad1ab76c40906018d3d8d (patch)
treec9822bed36859175e210c7c5867a1119c5af32bf /src/scheme/ao_scheme_cons.c
parentfa6f4b331db9d37da6767005fd375b696485b46b (diff)
altos/scheme: AO_SCHEME_IS_CONS -> ao_scheme_is_cons
This inline was already defined; just use it. Also, switch some places to use ao_scheme_is_pair instead as appropriate. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/scheme/ao_scheme_cons.c')
-rw-r--r--src/scheme/ao_scheme_cons.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scheme/ao_scheme_cons.c b/src/scheme/ao_scheme_cons.c
index d40c2826..1a2de823 100644
--- a/src/scheme/ao_scheme_cons.c
+++ b/src/scheme/ao_scheme_cons.c
@@ -24,7 +24,7 @@ static void cons_mark(void *addr)
ao_scheme_poly_mark(cons->car, 1);
if (!cdr)
break;
- if (!AO_SCHEME_IS_CONS(cdr)) {
+ if (!ao_scheme_is_cons(cdr)) {
ao_scheme_poly_mark(cdr, 0);
break;
}
@@ -58,7 +58,7 @@ static void cons_move(void *addr)
cdr = cons->cdr;
if (!cdr)
break;
- if (!AO_SCHEME_IS_CONS(cdr)) {
+ if (!ao_scheme_is_cons(cdr)) {
(void) ao_scheme_poly_move(&cons->cdr, 0);
break;
}
@@ -111,7 +111,7 @@ ao_scheme_cons_cdr(struct ao_scheme_cons *cons)
ao_poly cdr = cons->cdr;
if (cdr == AO_SCHEME_NIL)
return NULL;
- if (!AO_SCHEME_IS_CONS(cdr)) {
+ if (!ao_scheme_is_cons(cdr)) {
(void) ao_scheme_error(AO_SCHEME_INVALID, "improper cdr %v", cdr);
return NULL;
}
@@ -151,7 +151,7 @@ ao_scheme_cons_copy(struct ao_scheme_cons *cons)
tail->cdr = ao_scheme_cons_poly(new);
tail = new;
cdr = cons->cdr;
- if (!AO_SCHEME_IS_CONS(cdr)) {
+ if (!ao_scheme_is_cons(cdr)) {
tail->cdr = cdr;
break;
}
@@ -203,7 +203,7 @@ ao_scheme_cons_write(ao_poly c, bool write)
written++;
cdr = cons->cdr;
- if (!AO_SCHEME_IS_CONS(cdr)) {
+ if (!ao_scheme_is_cons(cdr)) {
printf(" . ");
ao_scheme_poly_write(cdr, write);
break;