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 b37e9098fc1d6c144fea88f4e8d05bf3cceda132..5b31c62312fa1884ded8455bc3047a6a54668899 100644 (file)
--- 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 221570c777ea5db268d2d55be0c340d844b7af20..f4dff5bf2a6622589a09650d232c6c60204186f7 100644 (file)
--- 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 7976250bee89fb683bd8e6ad7ba678c38dc2e773..d40c2826d837d1c9e66152fa1b194d2f960658bf 100644 (file)
--- 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 9204ce1a9a379743c26827e0fc3a215da2bca4b9..edc16a7361e86f8527ff9f15e86af20bc1f618cc 100644 (file)
--- 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 721211bc7a9b3ad1e57e23d6803bf516f215de8b..e93466fc688eff4142989f308d01b592e8985eaf 100644 (file)
--- 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;