From: Keith Packard <keithp@keithp.com>
Date: Tue, 19 Dec 2017 19:43:23 +0000 (-0800)
Subject: altos/scheme: ao_scheme__cons -> ao_scheme_cons
X-Git-Tag: 1.8.4~1^2~10
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=fa6f4b331db9d37da6767005fd375b696485b46b

altos/scheme: ao_scheme__cons -> ao_scheme_cons

Fix the double underscore in this name. Ick.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/scheme/ao_scheme.h b/src/scheme/ao_scheme.h
index b37e9098..5b31c623 100644
--- a/src/scheme/ao_scheme.h
+++ b/src/scheme/ao_scheme.h
@@ -646,7 +646,7 @@ struct ao_scheme_cons *
 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);
 
 extern struct ao_scheme_cons *ao_scheme_cons_free_list;
 
diff --git a/src/scheme/ao_scheme_builtin.c b/src/scheme/ao_scheme_builtin.c
index 221570c7..f4dff5bf 100644
--- a/src/scheme/ao_scheme_builtin.c
+++ b/src/scheme/ao_scheme_builtin.c
@@ -168,7 +168,7 @@ ao_scheme_do_cons(struct ao_scheme_cons *cons)
 		return AO_SCHEME_NIL;
 	car = ao_scheme_arg(cons, 0);
 	cdr = ao_scheme_arg(cons, 1);
-	return ao_scheme__cons(car, cdr);
+	return ao_scheme_cons(car, cdr);
 }
 
 ao_poly
@@ -253,10 +253,10 @@ ao_scheme_do_setq(struct ao_scheme_cons *cons)
 		return ao_scheme_error(AO_SCHEME_INVALID, "set! of non-atom %v", name);
 	if (!ao_scheme_atom_ref(name, NULL))
 		return ao_scheme_error(AO_SCHEME_INVALID, "atom %v not defined", name);
-	return ao_scheme__cons(_ao_scheme_atom_set,
-			     ao_scheme__cons(ao_scheme__cons(_ao_scheme_atom_quote,
-							 ao_scheme__cons(name, AO_SCHEME_NIL)),
-					   cons->cdr));
+	return ao_scheme_cons(_ao_scheme_atom_set,
+			      ao_scheme_cons(ao_scheme_cons(_ao_scheme_atom_quote,
+							    ao_scheme_cons(name, AO_SCHEME_NIL)),
+					     cons->cdr));
 }
 
 ao_poly
diff --git a/src/scheme/ao_scheme_cons.c b/src/scheme/ao_scheme_cons.c
index 7976250b..d40c2826 100644
--- a/src/scheme/ao_scheme_cons.c
+++ b/src/scheme/ao_scheme_cons.c
@@ -119,7 +119,7 @@ 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));
 }
diff --git a/src/scheme/ao_scheme_eval.c b/src/scheme/ao_scheme_eval.c
index 9204ce1a..edc16a73 100644
--- a/src/scheme/ao_scheme_eval.c
+++ b/src/scheme/ao_scheme_eval.c
@@ -206,7 +206,7 @@ ao_scheme_eval_formal(void)
 	}
 
 	/* Append formal to list of values */
-	formal = ao_scheme__cons(ao_scheme_v, AO_SCHEME_NIL);
+	formal = ao_scheme_cons(ao_scheme_v, AO_SCHEME_NIL);
 	if (!formal)
 		return 0;
 
diff --git a/src/scheme/ao_scheme_read.c b/src/scheme/ao_scheme_read.c
index 721211bc..e93466fc 100644
--- a/src/scheme/ao_scheme_read.c
+++ b/src/scheme/ao_scheme_read.c
@@ -510,7 +510,7 @@ push_read_stack(int read_state)
 	RDBG_IN();
 	if (ao_scheme_read_list) {
 		ao_scheme_read_stack = ao_scheme_cons_cons(ao_scheme_cons_poly(ao_scheme_read_cons),
-						       ao_scheme__cons(ao_scheme_int_poly(read_state),
+						       ao_scheme_cons(ao_scheme_int_poly(read_state),
 								     ao_scheme_cons_poly(ao_scheme_read_stack)));
 		if (!ao_scheme_read_stack)
 			return 0;