X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_float.c;h=483035f9cb205f1bb514c737184cb9e5e3569186;hb=16061947d4376b41e596d87f97ec53ec29d17644;hp=541f02644f37f51043210968fe82585325e3e8c3;hpb=2f8fce1cf6ce4bd12a836cc8ee15f4edbc95c95e;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_float.c b/src/scheme/ao_scheme_float.c
index 541f0264..483035f9 100644
--- a/src/scheme/ao_scheme_float.c
+++ b/src/scheme/ao_scheme_float.c
@@ -15,6 +15,8 @@
 #include "ao_scheme.h"
 #include <math.h>
 
+#ifdef AO_SCHEME_FEATURE_FLOAT
+
 static void float_mark(void *addr)
 {
 	(void) addr;
@@ -39,22 +41,27 @@ const struct ao_scheme_type ao_scheme_float_type = {
 	.name = "float",
 };
 
+#ifndef FLOAT_FORMAT
+#define FLOAT_FORMAT "%g"
+#endif
+
 void
-ao_scheme_float_write(ao_poly p)
+ao_scheme_float_write(FILE *out, ao_poly p, bool write)
 {
 	struct ao_scheme_float *f = ao_scheme_poly_float(p);
 	float	v = f->value;
 
+	(void) write;
 	if (isnanf(v))
-		printf("+nan.0");
+		fputs("+nan.0", out);
 	else if (isinff(v)) {
 		if (v < 0)
-			printf("-");
+			putc('-', out);
 		else
-			printf("+");
-		printf("inf.0");
+			putc('+', out);
+		fputs("inf.0", out);
 	} else
-		printf ("%g", f->value);
+		fprintf(out, FLOAT_FORMAT, v);
 }
 
 float
@@ -63,10 +70,10 @@ ao_scheme_poly_number(ao_poly p)
 	switch (ao_scheme_poly_base_type(p)) {
 	case AO_SCHEME_INT:
 		return ao_scheme_poly_int(p);
+	case AO_SCHEME_BIGINT:
+		return ao_scheme_poly_bigint(p)->value;
 	case AO_SCHEME_OTHER:
 		switch (ao_scheme_other_type(ao_scheme_poly_other(p))) {
-		case AO_SCHEME_BIGINT:
-			return ao_scheme_bigint_int(ao_scheme_poly_bigint(p)->value);
 		case AO_SCHEME_FLOAT:
 			return ao_scheme_poly_float(p)->value;
 		}
@@ -88,9 +95,13 @@ ao_scheme_float_get(float value)
 ao_poly
 ao_scheme_do_inexactp(struct ao_scheme_cons *cons)
 {
-	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
+	ao_poly	val;
+
+	if (!ao_scheme_parse_args(_ao_scheme_atom_inexact3f, cons,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
 		return AO_SCHEME_NIL;
-	if (ao_scheme_poly_type(ao_scheme_arg(cons, 0)) == AO_SCHEME_FLOAT)
+	if (ao_scheme_poly_type(val) == AO_SCHEME_FLOAT)
 		return _ao_scheme_bool_true;
 	return _ao_scheme_bool_false;
 }
@@ -98,18 +109,19 @@ ao_scheme_do_inexactp(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_finitep(struct ao_scheme_cons *cons)
 {
-	ao_poly	value;
+	ao_poly	val;
 	float	f;
 
-	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
+	if (!ao_scheme_parse_args(_ao_scheme_atom_inexact3f, cons,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
 		return AO_SCHEME_NIL;
-	value = ao_scheme_arg(cons, 0);
-	switch (ao_scheme_poly_type(value)) {
+	switch (ao_scheme_poly_type(val)) {
 	case AO_SCHEME_INT:
 	case AO_SCHEME_BIGINT:
 		return _ao_scheme_bool_true;
 	case AO_SCHEME_FLOAT:
-		f = ao_scheme_poly_float(value)->value;
+		f = ao_scheme_poly_float(val)->value;
 		if (!isnan(f) && !isinf(f))
 			return _ao_scheme_bool_true;
 	}
@@ -119,15 +131,16 @@ ao_scheme_do_finitep(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_infinitep(struct ao_scheme_cons *cons)
 {
-	ao_poly	value;
+	ao_poly	val;
 	float	f;
 
-	if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
+	if (!ao_scheme_parse_args(_ao_scheme_atom_inexact3f, cons,
+				  AO_SCHEME_POLY, &val,
+				  AO_SCHEME_ARG_END))
 		return AO_SCHEME_NIL;
-	value = ao_scheme_arg(cons, 0);
-	switch (ao_scheme_poly_type(value)) {
+	switch (ao_scheme_poly_type(val)) {
 	case AO_SCHEME_FLOAT:
-		f = ao_scheme_poly_float(value)->value;
+		f = ao_scheme_poly_float(val)->value;
 		if (isinf(f))
 			return _ao_scheme_bool_true;
 	}
@@ -137,12 +150,12 @@ ao_scheme_do_infinitep(struct ao_scheme_cons *cons)
 ao_poly
 ao_scheme_do_sqrt(struct ao_scheme_cons *cons)
 {
-	ao_poly	value;
+	float	f;
 
-	if (!ao_scheme_check_argc(_ao_scheme_atom_sqrt, cons, 1, 1))
+	if (!ao_scheme_parse_args(_ao_scheme_atom_sqrt, cons,
+				  AO_SCHEME_FLOAT, &f,
+				  AO_SCHEME_ARG_END))
 		return AO_SCHEME_NIL;
-	value = ao_scheme_arg(cons, 0);
-	if (!ao_scheme_number_typep(ao_scheme_poly_type(value)))
-		return ao_scheme_error(AO_SCHEME_INVALID, "%s: non-numeric", ao_scheme_poly_atom(_ao_scheme_atom_sqrt)->name);
-	return ao_scheme_float_get(sqrtf(ao_scheme_poly_number(value)));
+	return ao_scheme_float_get(sqrtf(f));
 }
+#endif