X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_builtin.c;h=221570c777ea5db268d2d55be0c340d844b7af20;hb=431165e5fa72ba6dffd477de32960745cdec332c;hp=c0f636fa78b58a5592ff97d655d509976a47e8ac;hpb=d8c9024f3829dc3f241b16869f165f3ee01764f3;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_builtin.c b/src/scheme/ao_scheme_builtin.c
index c0f636fa..221570c7 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,14 +79,15 @@ 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
 
 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));
 }
 
@@ -127,13 +128,14 @@ ao_scheme_check_argt(ao_poly name, struct ao_scheme_cons *cons, int argc, int ty
 	return _ao_scheme_bool_true;
 }
 
-int32_t
+static int32_t
 ao_scheme_arg_int(ao_poly name, struct ao_scheme_cons *cons, int argc)
 {
-	ao_poly p = ao_scheme_arg(cons, argc);
-	int32_t	i = ao_scheme_poly_integer(p);
+	ao_poly 	p = ao_scheme_arg(cons, argc);
+	bool		fail = false;
+	int32_t		i = ao_scheme_poly_integer(p, &fail);
 
-	if (i == AO_SCHEME_NOT_INTEGER)
+	if (fail)
 		(void) ao_scheme_error(AO_SCHEME_INVALID, "%v: arg %d invalid type %v", name, argc, p);
 	return i;
 }
@@ -286,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(" ");
@@ -300,16 +302,16 @@ 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;
 }
 
-ao_poly
+static ao_poly
 ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 {
-	struct ao_scheme_cons *cons = cons;
+	struct ao_scheme_cons *cons;
 	ao_poly	ret = AO_SCHEME_NIL;
 
 	for (cons = orig_cons; cons; cons = ao_scheme_cons_cdr(cons)) {
@@ -324,14 +326,14 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 				switch (op) {
 				case builtin_minus:
 					if (ao_scheme_integer_typep(ct))
-						ret = ao_scheme_integer_poly(-ao_scheme_poly_integer(ret));
+						ret = ao_scheme_integer_poly(-ao_scheme_poly_integer(ret, NULL));
 #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) {
+					if (ao_scheme_poly_integer(ret, NULL) == 1) {
 					} else {
 #ifdef AO_SCHEME_FEATURE_FLOAT
 						if (ao_scheme_number_typep(ct)) {
@@ -349,8 +351,8 @@ ao_scheme_math(struct ao_scheme_cons *orig_cons, enum ao_scheme_builtin_id op)
 			}
 			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);
+			int32_t	r = ao_scheme_poly_integer(ret, NULL);
+			int32_t	c = ao_scheme_poly_integer(car, NULL);
 #ifdef AO_SCHEME_FEATURE_FLOAT
 			int64_t t;
 #endif
@@ -501,7 +503,7 @@ ao_scheme_do_remainder(struct ao_scheme_cons *cons)
 	return ao_scheme_math(cons, builtin_remainder);
 }
 
-ao_poly
+static ao_poly
 ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 {
 	ao_poly	left;
@@ -519,8 +521,8 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 			uint8_t	lt = ao_scheme_poly_type(left);
 			uint8_t	rt = ao_scheme_poly_type(right);
 			if (ao_scheme_integer_typep(lt) && ao_scheme_integer_typep(rt)) {
-				int32_t l = ao_scheme_poly_integer(left);
-				int32_t r = ao_scheme_poly_integer(right);
+				int32_t l = ao_scheme_poly_integer(left, NULL);
+				int32_t r = ao_scheme_poly_integer(right, NULL);
 
 				switch (op) {
 				case builtin_less:
@@ -545,6 +547,7 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 				default:
 					break;
 				}
+#ifdef AO_SCHEME_FEATURE_FLOAT
 			} else if (ao_scheme_number_typep(lt) && ao_scheme_number_typep(rt)) {
 				float l, r;
 
@@ -574,9 +577,10 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 				default:
 					break;
 				}
+#endif /* AO_SCHEME_FEATURE_FLOAT */
 			} else if (lt == AO_SCHEME_STRING && rt == AO_SCHEME_STRING) {
-				int c = strcmp(ao_scheme_poly_string(left),
-					       ao_scheme_poly_string(right));
+				int c = strcmp(ao_scheme_poly_string(left)->val,
+					       ao_scheme_poly_string(right)->val);
 				switch (op) {
 				case builtin_less:
 					if (!(c < 0))
@@ -662,16 +666,16 @@ ao_scheme_do_string_to_list(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_string_ref(struct ao_scheme_cons *cons)
 {
-	char *string;
+	char	*string;
 	int32_t ref;
 	if (!ao_scheme_check_argc(_ao_scheme_atom_string2dref, cons, 2, 2))
 		return AO_SCHEME_NIL;
 	if (!ao_scheme_check_argt(_ao_scheme_atom_string2dref, cons, 0, AO_SCHEME_STRING, 0))
 		return AO_SCHEME_NIL;
 	ref = ao_scheme_arg_int(_ao_scheme_atom_string2dref, cons, 1);
-	if (ref == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
-	string = ao_scheme_poly_string(ao_scheme_arg(cons, 0));
+	string = ao_scheme_poly_string(ao_scheme_arg(cons, 0))->val;
 	while (*string && ref) {
 		++string;
 		--ref;
@@ -687,20 +691,20 @@ ao_scheme_do_string_ref(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_string_length(struct ao_scheme_cons *cons)
 {
-	char *string;
+	struct ao_scheme_string *string;
 
 	if (!ao_scheme_check_argc(_ao_scheme_atom_string2dlength, cons, 1, 1))
 		return AO_SCHEME_NIL;
 	if (!ao_scheme_check_argt(_ao_scheme_atom_string2dlength, cons, 0, AO_SCHEME_STRING, 0))
 		return AO_SCHEME_NIL;
 	string = ao_scheme_poly_string(ao_scheme_arg(cons, 0));
-	return ao_scheme_integer_poly(strlen(string));
+	return ao_scheme_integer_poly(strlen(string->val));
 }
 
 ao_poly
 ao_scheme_do_string_copy(struct ao_scheme_cons *cons)
 {
-	char *string;
+	struct ao_scheme_string	*string;
 
 	if (!ao_scheme_check_argc(_ao_scheme_atom_string2dcopy, cons, 1, 1))
 		return AO_SCHEME_NIL;
@@ -713,7 +717,7 @@ ao_scheme_do_string_copy(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_string_set(struct ao_scheme_cons *cons)
 {
-	char *string;
+	char	*string;
 	int32_t ref;
 	int32_t val;
 
@@ -721,12 +725,12 @@ ao_scheme_do_string_set(struct ao_scheme_cons *cons)
 		return AO_SCHEME_NIL;
 	if (!ao_scheme_check_argt(_ao_scheme_atom_string2dset21, cons, 0, AO_SCHEME_STRING, 0))
 		return AO_SCHEME_NIL;
-	string = ao_scheme_poly_string(ao_scheme_arg(cons, 0));
+	string = ao_scheme_poly_string(ao_scheme_arg(cons, 0))->val;
 	ref = ao_scheme_arg_int(_ao_scheme_atom_string2dset21, cons, 1);
-	if (ref == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
 	val = ao_scheme_arg_int(_ao_scheme_atom_string2dset21, cons, 2);
-	if (val == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
 	while (*string && ref) {
 		++string;
@@ -757,7 +761,7 @@ ao_scheme_do_led(struct ao_scheme_cons *cons)
 	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
 		return AO_SCHEME_NIL;
 	led = ao_scheme_arg_int(_ao_scheme_atom_led, cons, 0);
-	if (led == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
 	led = ao_scheme_arg(cons, 0);
 	ao_scheme_os_led(ao_scheme_poly_int(led));
@@ -772,7 +776,7 @@ ao_scheme_do_delay(struct ao_scheme_cons *cons)
 	if (!ao_scheme_check_argc(_ao_scheme_atom_delay, cons, 1, 1))
 		return AO_SCHEME_NIL;
 	delay = ao_scheme_arg_int(_ao_scheme_atom_delay, cons, 0);
-	if (delay == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
 	ao_scheme_os_delay(delay);
 	return delay;
@@ -852,7 +856,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 (v != AO_SCHEME_NIL && AO_SCHEME_IS_CONS(v))
 		return _ao_scheme_bool_true;
 	return _ao_scheme_bool_false;
 }
@@ -943,7 +947,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;
 	}
@@ -976,7 +980,7 @@ ao_scheme_do_symbol_to_string(struct ao_scheme_cons *cons)
 		return AO_SCHEME_NIL;
 	if (!ao_scheme_check_argt(_ao_scheme_atom_led, cons, 0, AO_SCHEME_ATOM, 0))
 		return AO_SCHEME_NIL;
-	return ao_scheme_string_poly(ao_scheme_string_copy(ao_scheme_poly_atom(ao_scheme_arg(cons, 0))->name));
+	return ao_scheme_string_poly(ao_scheme_atom_to_string(ao_scheme_poly_atom(ao_scheme_arg(cons, 0))));
 }
 
 ao_poly
@@ -987,7 +991,7 @@ ao_scheme_do_string_to_symbol(struct ao_scheme_cons *cons)
 	if (!ao_scheme_check_argt(_ao_scheme_atom_led, cons, 0, AO_SCHEME_STRING, 0))
 		return AO_SCHEME_NIL;
 
-	return ao_scheme_atom_poly(ao_scheme_atom_intern(ao_scheme_poly_string(ao_scheme_arg(cons, 0))));
+	return ao_scheme_atom_poly(ao_scheme_string_to_atom(ao_scheme_poly_string(ao_scheme_arg(cons, 0))));;
 }
 
 ao_poly
@@ -1007,7 +1011,7 @@ ao_scheme_do_write_char(struct ao_scheme_cons *cons)
 		return AO_SCHEME_NIL;
 	if (!ao_scheme_check_argt(_ao_scheme_atom_led, cons, 0, AO_SCHEME_INT, 0))
 		return AO_SCHEME_NIL;
-	putchar(ao_scheme_poly_integer(ao_scheme_arg(cons, 0)));
+	putchar(ao_scheme_poly_integer(ao_scheme_arg(cons, 0), NULL));
 	return _ao_scheme_bool_true;
 }
 
@@ -1066,7 +1070,7 @@ ao_scheme_do_make_vector(struct ao_scheme_cons *cons)
 	if (!ao_scheme_check_argc(_ao_scheme_atom_make2dvector, cons, 2, 2))
 		return AO_SCHEME_NIL;
 	k = ao_scheme_arg_int(_ao_scheme_atom_make2dvector, cons, 0);
-	if (k == AO_SCHEME_NOT_INTEGER)
+	if (ao_scheme_exception)
 		return AO_SCHEME_NIL;
 	return ao_scheme_vector_poly(ao_scheme_vector_alloc(k, ao_scheme_arg(cons, 1)));
 }