X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_builtin.c;h=4def57045bbea9c56d77a34936941c644cf5805f;hb=4bfce37e7567d9c2a09ea4da8113e7639516ed6e;hp=6f9e1390c9eb6e090bb74d40872aba5439f91709;hpb=b72638e60b6636b479b79bbf0047cf7409f58820;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_builtin.c b/src/scheme/ao_scheme_builtin.c
index 6f9e1390..4def5704 100644
--- a/src/scheme/ao_scheme_builtin.c
+++ b/src/scheme/ao_scheme_builtin.c
@@ -52,7 +52,7 @@ char *ao_scheme_args_name(uint8_t args) {
 	case AO_SCHEME_FUNC_LAMBDA: return ao_scheme_poly_atom(_ao_scheme_atom_lambda)->name;
 	case AO_SCHEME_FUNC_NLAMBDA: return ao_scheme_poly_atom(_ao_scheme_atom_nlambda)->name;
 	case AO_SCHEME_FUNC_MACRO: return ao_scheme_poly_atom(_ao_scheme_atom_macro)->name;
-	default: return "???";
+	default: return (char *) "???";
 	}
 }
 #else
@@ -64,7 +64,7 @@ static char *
 ao_scheme_builtin_name(enum ao_scheme_builtin_id b) {
 	if (b < _builtin_last)
 		return ao_scheme_poly_atom(builtin_names[b])->name;
-	return "???";
+	return (char *) "???";
 }
 
 static const ao_poly ao_scheme_args_atoms[] = {
@@ -79,7 +79,7 @@ ao_scheme_args_name(uint8_t args)
 	args &= AO_SCHEME_FUNC_MASK;
 	if (args < sizeof ao_scheme_args_atoms / sizeof ao_scheme_args_atoms[0])
 		return ao_scheme_poly_atom(ao_scheme_args_atoms[args])->name;
-	return "(unknown)";
+	return (char *) "(unknown)";
 }
 #endif
 
@@ -319,53 +319,74 @@ 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);
 			if (cons->cdr == AO_SCHEME_NIL) {
 				switch (op) {
 				case builtin_minus:
 					if (ao_scheme_integer_typep(ct))
 						ret = ao_scheme_integer_poly(-ao_scheme_poly_integer(ret));
+#ifdef AO_SCHEME_FEATURE_FLOAT
 					else if (ct == AO_SCHEME_FLOAT)
 						ret = ao_scheme_float_get(-ao_scheme_poly_number(ret));
+#endif
 					break;
 				case builtin_divide:
-					if (ao_scheme_integer_typep(ct) && ao_scheme_poly_integer(ret) == 1)
-						;
-					else if (ao_scheme_number_typep(ct)) {
-						float	v = ao_scheme_poly_number(ret);
-						ret = ao_scheme_float_get(1/v);
+					if (ao_scheme_integer_typep(ct) && ao_scheme_poly_integer(ret) == 1) {
+					} else {
+#ifdef AO_SCHEME_FEATURE_FLOAT
+						if (ao_scheme_number_typep(ct)) {
+							float	v = ao_scheme_poly_number(ret);
+							ret = ao_scheme_float_get(1/v);
+						}
+#else
+						ret = ao_scheme_integer_poly(0);
+#endif
 					}
 					break;
 				default:
 					break;
 				}
 			}
+			cons = ao_scheme_cons_fetch(0);
 		} else if (ao_scheme_integer_typep(rt) && ao_scheme_integer_typep(ct)) {
 			int32_t	r = ao_scheme_poly_integer(ret);
 			int32_t	c = ao_scheme_poly_integer(car);
+#ifdef AO_SCHEME_FEATURE_FLOAT
 			int64_t t;
+#endif
 
 			switch(op) {
 			case builtin_plus:
 				r += c;
 			check_overflow:
+#ifdef AO_SCHEME_FEATURE_FLOAT
 				if (r < AO_SCHEME_MIN_BIGINT || AO_SCHEME_MAX_BIGINT < r)
 					goto inexact;
+#endif
 				break;
 			case builtin_minus:
 				r -= c;
 				goto check_overflow;
 				break;
 			case builtin_times:
+#ifdef AO_SCHEME_FEATURE_FLOAT
 				t = (int64_t) r * (int64_t) c;
 				if (t < AO_SCHEME_MIN_BIGINT || AO_SCHEME_MAX_BIGINT < t)
 					goto inexact;
 				r = (int32_t) t;
+#else
+				r = r * c;
+#endif
 				break;
 			case builtin_divide:
+#ifdef AO_SCHEME_FEATURE_FLOAT
 				if (c != 0 && (r % c) == 0)
 					r /= c;
 				else
 					goto inexact;
+#else
+				r /= c;
+#endif
 				break;
 			case builtin_quotient:
 				if (c == 0)
@@ -390,7 +411,10 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 			default:
 				break;
 			}
+			ao_scheme_cons_stash(0, cons);
 			ret = ao_scheme_integer_poly(r);
+			cons = ao_scheme_cons_fetch(0);
+#ifdef AO_SCHEME_FEATURE_FLOAT
 		} else if (ao_scheme_number_typep(rt) && ao_scheme_number_typep(ct)) {
 			float r, c;
 		inexact:
@@ -416,12 +440,19 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 			default:
 				break;
 			}
+			ao_scheme_cons_stash(0, cons);
 			ret = ao_scheme_float_get(r);
+			cons = ao_scheme_cons_fetch(0);
+#endif
 		}
-
-		else if (rt == AO_SCHEME_STRING && ct == AO_SCHEME_STRING && op == builtin_plus)
+		else if (rt == AO_SCHEME_STRING && ct == AO_SCHEME_STRING && op == builtin_plus) {
+			ao_scheme_cons_stash(0, cons);
 			ret = ao_scheme_string_poly(ao_scheme_string_cat(ao_scheme_poly_string(ret),
-								     ao_scheme_poly_string(car)));
+									 ao_scheme_poly_string(car)));
+			cons = ao_scheme_cons_fetch(0);
+			if (!ret)
+				return ret;
+		}
 		else
 			return ao_scheme_error(AO_SCHEME_INVALID, "invalid args");
 	}
@@ -482,9 +513,8 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 	for (cons = ao_scheme_cons_cdr(cons); cons; cons = ao_scheme_cons_cdr(cons)) {
 		ao_poly	right = cons->car;
 
-		if (op == builtin_equal) {
-			if (left != right)
-				return _ao_scheme_bool_false;
+		if (op == builtin_equal && left == right) {
+			;
 		} else {
 			uint8_t	lt = ao_scheme_poly_type(left);
 			uint8_t	rt = ao_scheme_poly_type(right);
@@ -509,6 +539,38 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 					if (!(l >= r))
 						return _ao_scheme_bool_false;
 					break;
+				case builtin_equal:
+					if (!(l == r))
+						return _ao_scheme_bool_false;
+				default:
+					break;
+				}
+			} else if (ao_scheme_number_typep(lt) && ao_scheme_number_typep(rt)) {
+				float l, r;
+
+				l = ao_scheme_poly_number(left);
+				r = ao_scheme_poly_number(right);
+
+				switch (op) {
+				case builtin_less:
+					if (!(l < r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_greater:
+					if (!(l > r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_less_equal:
+					if (!(l <= r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_greater_equal:
+					if (!(l >= r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_equal:
+					if (!(l == r))
+						return _ao_scheme_bool_false;
 				default:
 					break;
 				}
@@ -532,10 +594,15 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 					if (!(c >= 0))
 						return _ao_scheme_bool_false;
 					break;
+				case builtin_equal:
+					if (!(c == 0))
+						return _ao_scheme_bool_false;
+					break;
 				default:
 					break;
 				}
-			}
+			} else
+				return _ao_scheme_bool_false;
 		}
 		left = right;
 	}
@@ -793,6 +860,7 @@ ao_scheme_do_pairp(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_integerp(struct ao_scheme_cons *cons)
 {
+#ifdef AO_SCHEME_FEATURE_BIGINT
 	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
 		return AO_SCHEME_NIL;
 	switch (ao_scheme_poly_type(ao_scheme_arg(cons, 0))) {
@@ -802,21 +870,32 @@ ao_scheme_do_integerp(struct ao_scheme_cons *cons)
 	default:
 		return _ao_scheme_bool_false;
 	}
+#else
+	return ao_scheme_do_typep(AO_SCHEME_INT, cons);
+#endif
 }
 
 ao_poly
 ao_scheme_do_numberp(struct ao_scheme_cons *cons)
 {
+#if defined(AO_SCHEME_FEATURE_BIGINT) || defined(AO_SCHEME_FEATURE_FLOAT)
 	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
 		return AO_SCHEME_NIL;
 	switch (ao_scheme_poly_type(ao_scheme_arg(cons, 0))) {
 	case AO_SCHEME_INT:
+#ifdef AO_SCHEME_FEATURE_BIGINT
 	case AO_SCHEME_BIGINT:
+#endif
+#ifdef AO_SCHEME_FEATURE_FLOAT
 	case AO_SCHEME_FLOAT:
+#endif
 		return _ao_scheme_bool_true;
 	default:
 		return _ao_scheme_bool_false;
 	}
+#else
+	return ao_scheme_do_integerp(cons);
+#endif
 }
 
 ao_poly
@@ -971,6 +1050,8 @@ ao_scheme_do_jiffies_per_second(struct ao_scheme_cons *cons)
 	return (ao_scheme_int_poly(AO_SCHEME_JIFFIES_PER_SECOND));
 }
 
+#ifdef AO_SCHEME_FEATURE_VECTOR
+
 ao_poly
 ao_scheme_do_vector(struct ao_scheme_cons *cons)
 {
@@ -1046,5 +1127,7 @@ ao_scheme_do_vectorp(struct ao_scheme_cons *cons)
 	return ao_scheme_do_typep(AO_SCHEME_VECTOR, cons);
 }
 
+#endif /* AO_SCHEME_FEATURE_VECTOR */
+
 #define AO_SCHEME_BUILTIN_FUNCS
 #include "ao_scheme_builtin.h"