X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_cons.c;h=a6e697b2998f744aa74e9c04c25254540bf4e0d4;hb=16061947d4376b41e596d87f97ec53ec29d17644;hp=0b3cbf809dc08666427414f66da42a98b88d0e3c;hpb=e1a6b3bf458f311d832aea7eec34935d42f8efed;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_cons.c b/src/scheme/ao_scheme_cons.c
index 0b3cbf80..a6e697b2 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;
 		}
@@ -92,11 +92,11 @@ ao_scheme_cons_cons(ao_poly car, ao_poly cdr)
 		cons = ao_scheme_cons_free_list;
 		ao_scheme_cons_free_list = ao_scheme_poly_cons(cons->cdr);
 	} else {
-		ao_scheme_poly_stash(0, car);
-		ao_scheme_poly_stash(1, cdr);
+		ao_scheme_poly_stash(car);
+		ao_scheme_poly_stash(cdr);
 		cons = ao_scheme_alloc(sizeof (struct ao_scheme_cons));
-		cdr = ao_scheme_poly_fetch(1);
-		car = ao_scheme_poly_fetch(0);
+		cdr = ao_scheme_poly_fetch();
+		car = ao_scheme_poly_fetch();
 		if (!cons)
 			return NULL;
 	}
@@ -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_poly_type(cdr) != AO_SCHEME_CONS) {
+	if (!ao_scheme_is_cons(cdr)) {
 		(void) ao_scheme_error(AO_SCHEME_INVALID, "improper cdr %v", cdr);
 		return NULL;
 	}
@@ -119,12 +119,12 @@ ao_scheme_cons_cdr(struct ao_scheme_cons *cons)
 }
 
 ao_poly
-ao_scheme__cons(ao_poly car, ao_poly cdr)
+ao_scheme_cons(ao_poly car, ao_poly cdr)
 {
 	return ao_scheme_cons_poly(ao_scheme_cons_cons(car, cdr));
 }
 
-struct ao_scheme_cons *
+static struct ao_scheme_cons *
 ao_scheme_cons_copy(struct ao_scheme_cons *cons)
 {
 	struct ao_scheme_cons	*head = NULL;
@@ -134,13 +134,13 @@ ao_scheme_cons_copy(struct ao_scheme_cons *cons)
 		struct ao_scheme_cons	*new;
 		ao_poly cdr;
 
-		ao_scheme_cons_stash(0, cons);
-		ao_scheme_cons_stash(1, head);
-		ao_scheme_poly_stash(0, ao_scheme_cons_poly(tail));
+		ao_scheme_cons_stash(cons);
+		ao_scheme_cons_stash(head);
+		ao_scheme_cons_stash(tail);
 		new = ao_scheme_alloc(sizeof (struct ao_scheme_cons));
-		cons = ao_scheme_cons_fetch(0);
-		head = ao_scheme_cons_fetch(1);
-		tail = ao_scheme_poly_cons(ao_scheme_poly_fetch(0));
+		tail = ao_scheme_cons_fetch();
+		head = ao_scheme_cons_fetch();
+		cons = ao_scheme_cons_fetch();
 		if (!new)
 			return AO_SCHEME_NIL;
 		new->car = cons->car;
@@ -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_poly_type(cdr) != AO_SCHEME_CONS) {
+		if (!ao_scheme_is_cons(cdr)) {
 			tail->cdr = cdr;
 			break;
 		}
@@ -175,59 +175,53 @@ ao_scheme_cons_free(struct ao_scheme_cons *cons)
 }
 
 void
-ao_scheme_cons_write(ao_poly c)
+ao_scheme_cons_write(FILE *out, ao_poly c, bool write)
 {
 	struct ao_scheme_cons	*cons = ao_scheme_poly_cons(c);
+	struct ao_scheme_cons	*clear = cons;
 	ao_poly			cdr;
-	int			first = 1;
+	int			written = 0;
 
 	ao_scheme_print_start();
-	printf("(");
+	fprintf(out, "(");
 	while (cons) {
-		if (!first)
-			printf(" ");
+		if (written != 0)
+			fprintf(out, " ");
+
+		/* Note if there's recursion in printing. Not
+		 * as good as actual references, but at least
+		 * we don't infinite loop...
+		 */
 		if (ao_scheme_print_mark_addr(cons)) {
-			printf("...");
+			fprintf(out, "...");
 			break;
 		}
-		ao_scheme_poly_write(cons->car);
-		cdr = cons->cdr;
-		if (ao_scheme_poly_type(cdr) == AO_SCHEME_CONS) {
-			cons = ao_scheme_poly_cons(cdr);
-			first = 0;
-		} else {
-			printf(" . ");
-			ao_scheme_poly_write(cdr);
-			cons = NULL;
-		}
-	}
-	printf(")");
-	ao_scheme_print_stop();
-}
 
-void
-ao_scheme_cons_display(ao_poly c)
-{
-	struct ao_scheme_cons	*cons = ao_scheme_poly_cons(c);
-	ao_poly			cdr;
+		ao_scheme_poly_write(out, cons->car, write);
 
-	ao_scheme_print_start();
-	while (cons) {
-		if (ao_scheme_print_mark_addr(cons)) {
-			printf("...");
+		/* keep track of how many pairs have been printed */
+		written++;
+
+		cdr = cons->cdr;
+		if (!ao_scheme_is_cons(cdr)) {
+			fprintf(out, " . ");
+			ao_scheme_poly_write(out, cdr, write);
 			break;
 		}
-		ao_scheme_poly_display(cons->car);
+		cons = ao_scheme_poly_cons(cdr);
+	}
+	fprintf(out, ")");
 
-		cdr = cons->cdr;
-		if (ao_scheme_poly_type(cdr) == AO_SCHEME_CONS)
-			cons = ao_scheme_poly_cons(cdr);
-		else {
-			ao_scheme_poly_display(cdr);
-			cons = NULL;
+	if (ao_scheme_print_stop()) {
+
+		/* If we're still printing, clear the print marks on
+		 * all printed pairs
+		 */
+		while (written--) {
+			ao_scheme_print_clear_addr(clear);
+			clear = ao_scheme_poly_cons(clear->cdr);
 		}
 	}
-	ao_scheme_print_stop();
 }
 
 int
@@ -240,3 +234,169 @@ ao_scheme_cons_length(struct ao_scheme_cons *cons)
 	}
 	return len;
 }
+
+ao_poly
+ao_scheme_do_car(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons *pair;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_car, cons,
+				  AO_SCHEME_CONS, &pair,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	return pair->car;
+}
+
+ao_poly
+ao_scheme_do_cdr(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons *pair;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_cdr, cons,
+				  AO_SCHEME_CONS, &pair,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	return pair->cdr;
+}
+
+ao_poly
+ao_scheme_do_cons(struct ao_scheme_cons *cons)
+{
+	ao_poly	car, cdr;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_cons, cons,
+				  AO_SCHEME_POLY, &car,
+				  AO_SCHEME_POLY, &cdr,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	return ao_scheme_cons(car, cdr);
+}
+
+ao_poly
+ao_scheme_do_last(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons	*pair;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_last, cons,
+				  AO_SCHEME_CONS | AO_SCHEME_ARG_NIL_OK, &pair,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	while (pair) {
+		if (!pair->cdr)
+			return pair->car;
+		pair = ao_scheme_cons_cdr(pair);
+	}
+	return AO_SCHEME_NIL;
+}
+
+ao_poly
+ao_scheme_do_length(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons	*pair;
+	if (!ao_scheme_parse_args(_ao_scheme_atom_length, cons,
+				  AO_SCHEME_CONS | AO_SCHEME_ARG_NIL_OK, &pair,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	return ao_scheme_integer_poly(ao_scheme_cons_length(pair));
+}
+
+ao_poly
+ao_scheme_do_list_copy(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons	*pair;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_list2dcopy, cons,
+				  AO_SCHEME_CONS | AO_SCHEME_ARG_NIL_OK, &pair,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	return ao_scheme_cons_poly(ao_scheme_cons_copy(pair));
+}
+
+ao_poly
+ao_scheme_do_list_tail(struct ao_scheme_cons *cons)
+{
+	ao_poly			list;
+	int32_t			v;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_list2dtail, cons,
+				  AO_SCHEME_CONS | AO_SCHEME_ARG_NIL_OK | AO_SCHEME_ARG_RET_POLY, &list,
+				  AO_SCHEME_INT, &v,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+
+	while (v > 0) {
+		if (!list)
+			return ao_scheme_error(AO_SCHEME_INVALID, "%v: ran off end", _ao_scheme_atom_list2dtail);
+		if (!ao_scheme_is_cons(list))
+			return ao_scheme_error(AO_SCHEME_INVALID, "%v: invalid list", _ao_scheme_atom_list2dtail);
+		list = ao_scheme_poly_cons(list)->cdr;
+		v--;
+	}
+	return list;
+}
+
+ao_poly
+ao_scheme_do_pairp(struct ao_scheme_cons *cons)
+{
+	ao_poly val;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_pair3f, cons,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	if (ao_scheme_is_pair(val))
+		return _ao_scheme_bool_true;
+	return _ao_scheme_bool_false;
+}
+
+/* This one is special -- a list is either nil or
+ * a 'proper' list with only cons cells
+ */
+ao_poly
+ao_scheme_do_listp(struct ao_scheme_cons *cons)
+{
+	ao_poly val;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_pair3f, cons,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	for (;;) {
+		if (val == AO_SCHEME_NIL)
+			return _ao_scheme_bool_true;
+		if (!ao_scheme_is_cons(val))
+			return _ao_scheme_bool_false;
+		val = ao_scheme_poly_cons(val)->cdr;
+	}
+}
+
+ao_poly
+ao_scheme_do_set_car(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons	*pair;
+	ao_poly			val;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_set2dcar21, cons,
+				  AO_SCHEME_CONS, &pair,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	pair->car = val;
+	return val;
+}
+
+ao_poly
+ao_scheme_do_set_cdr(struct ao_scheme_cons *cons)
+{
+	struct ao_scheme_cons	*pair;
+	ao_poly			val;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_set2dcar21, cons,
+				  AO_SCHEME_CONS, &pair,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
+		return AO_SCHEME_NIL;
+	pair->cdr = val;
+	return val;
+}
+