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
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
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:
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);
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
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;
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;
}
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)
{
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_IS_CONS(v))
+ if (ao_scheme_is_pair(v))
return _ao_scheme_bool_true;
return _ao_scheme_bool_false;
}
for (;;) {
if (v == AO_SCHEME_NIL)
return _ao_scheme_bool_true;
- if (!AO_SCHEME_IS_CONS(v))
+ if (!ao_scheme_is_cons(v))
return _ao_scheme_bool_false;
v = ao_scheme_poly_cons(v)->cdr;
}