altos/scheme: Add separate floor-quotient builtin

[fw/altos] / src / scheme / ao_scheme_builtin.c

diff --git a/src/scheme/ao_scheme_builtin.c b/src/scheme/ao_scheme_builtin.c
index 9a823f6ab917812c80d27143b73c7c2f19bcfb62..e2532c98746a331ae248ace4f825ab41c4d1d874 100644 (file)
--- a/src/scheme/ao_scheme_builtin.c
+++ b/src/scheme/ao_scheme_builtin.c
@@ -84,9 +84,10 @@ ao_scheme_args_name(uint8_t args)
 #endif
 
 void
-ao_scheme_builtin_write(ao_poly b)
+ao_scheme_builtin_write(ao_poly b, bool write)
 {
        struct ao_scheme_builtin *builtin = ao_scheme_poly_builtin(b);
+       (void) write;
        printf("%s", ao_scheme_builtin_name(builtin->func));
 }
 
@@ -167,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
@@ -252,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
@@ -287,7 +288,7 @@ ao_scheme_do_write(struct ao_scheme_cons *cons)
        ao_poly val = AO_SCHEME_NIL;
        while (cons) {
                val = cons->car;
-               ao_scheme_poly_write(val);
+               ao_scheme_poly_write(val, true);
                cons = ao_scheme_cons_cdr(cons);
                if (cons)
                        printf(" ");
@@ -301,7 +302,7 @@ ao_scheme_do_display(struct ao_scheme_cons *cons)
        ao_poly val = AO_SCHEME_NIL;
        while (cons) {
                val = cons->car;
-               ao_scheme_poly_display(val);
+               ao_scheme_poly_write(val, false);
                cons = ao_scheme_cons_cdr(cons);
        }
        return _ao_scheme_bool_true;
@@ -320,7 +321,7 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 
                if (cons == orig_cons) {
                        ret = car;
-                       ao_scheme_cons_stash(0, cons);
+                       ao_scheme_cons_stash(cons);
                        if (cons->cdr == AO_SCHEME_NIL) {
                                switch (op) {
                                case builtin_minus:
@@ -348,7 +349,7 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
                                        break;
                                }
                        }
-                       cons = ao_scheme_cons_fetch(0);
+                       cons = ao_scheme_cons_fetch();
                } else if (ao_scheme_integer_typep(rt) && ao_scheme_integer_typep(ct)) {
                        int32_t r = ao_scheme_poly_integer(ret, NULL);
                        int32_t c = ao_scheme_poly_integer(car, NULL);
@@ -392,6 +393,11 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
                        case builtin_quotient:
                                if (c == 0)
                                        return ao_scheme_error(AO_SCHEME_DIVIDE_BY_ZERO, "quotient by zero");
+                               r = r / c;
+                               break;
+                       case builtin_floor_quotient:
+                               if (c == 0)
+                                       return ao_scheme_error(AO_SCHEME_DIVIDE_BY_ZERO, "floor-quotient by zero");
                                if (r % c != 0 && (c < 0) != (r < 0))
                                        r = r / c - 1;
                                else
@@ -412,9 +418,9 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
                        default:
                                break;
                        }
-                       ao_scheme_cons_stash(0, cons);
+                       ao_scheme_cons_stash(cons);
                        ret = ao_scheme_integer_poly(r);
-                       cons = ao_scheme_cons_fetch(0);
+                       cons = ao_scheme_cons_fetch();
 #ifdef AO_SCHEME_FEATURE_FLOAT
                } else if (ao_scheme_number_typep(rt) && ao_scheme_number_typep(ct)) {
                        float r, c;
@@ -435,22 +441,23 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
                                r /= c;
                                break;
                        case builtin_quotient:
+                       case builtin_floor_quotient:
                        case builtin_remainder:
                        case builtin_modulo:
                                return ao_scheme_error(AO_SCHEME_INVALID, "non-integer value in integer divide");
                        default:
                                break;
                        }
-                       ao_scheme_cons_stash(0, cons);
+                       ao_scheme_cons_stash(cons);
                        ret = ao_scheme_float_get(r);
-                       cons = ao_scheme_cons_fetch(0);
+                       cons = ao_scheme_cons_fetch();
 #endif
                }
                else if (rt == AO_SCHEME_STRING && ct == AO_SCHEME_STRING && op == builtin_plus) {
-                       ao_scheme_cons_stash(0, cons);
+                       ao_scheme_cons_stash(cons);
                        ret = ao_scheme_string_poly(ao_scheme_string_cat(ao_scheme_poly_string(ret),
                                                                         ao_scheme_poly_string(car)));
-                       cons = ao_scheme_cons_fetch(0);
+                       cons = ao_scheme_cons_fetch();
                        if (!ret)
                                return ret;
                }
@@ -490,6 +497,12 @@ ao_scheme_do_quotient(struct ao_scheme_cons *cons)
        return ao_scheme_math(cons, builtin_quotient);
 }
 
+ao_poly
+ao_scheme_do_floor_quotient(struct ao_scheme_cons *cons)
+{
+       return ao_scheme_math(cons, builtin_floor_quotient);
+}
+
 ao_poly
 ao_scheme_do_modulo(struct ao_scheme_cons *cons)
 {
@@ -855,7 +868,7 @@ ao_scheme_do_pairp(struct ao_scheme_cons *cons)
        if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
                return AO_SCHEME_NIL;
        v = ao_scheme_arg(cons, 0);
-       if (v != AO_SCHEME_NIL && ao_scheme_poly_type(v) == AO_SCHEME_CONS)
+       if (ao_scheme_is_pair(v))
                return _ao_scheme_bool_true;
        return _ao_scheme_bool_false;
 }
@@ -946,7 +959,7 @@ ao_scheme_do_listp(struct ao_scheme_cons *cons)
        for (;;) {
                if (v == AO_SCHEME_NIL)
                        return _ao_scheme_bool_true;
-               if (ao_scheme_poly_type(v) != AO_SCHEME_CONS)
+               if (!ao_scheme_is_cons(v))
                        return _ao_scheme_bool_false;
                v = ao_scheme_poly_cons(v)->cdr;
        }