X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_poly.c;h=70e577a2a7627f2bb2c9c80abe9dda8244533f07;hb=2def6abebb3d14a29fe0e03bac09b9d74d2d1578;hp=553585db33f80ab9884e642be4eff68c1b5a84ff;hpb=d1d98e408311c5ba18138a18f4c88448e4254626;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_poly.c b/src/scheme/ao_scheme_poly.c
index 553585db..70e577a2 100644
--- a/src/scheme/ao_scheme_poly.c
+++ b/src/scheme/ao_scheme_poly.c
@@ -24,10 +24,12 @@ static const struct ao_scheme_funcs ao_scheme_funcs[AO_SCHEME_NUM_TYPE] = {
 		.write = ao_scheme_cons_write,
 		.display = ao_scheme_cons_display,
 	},
-	[AO_SCHEME_STRING] = {
-		.write = ao_scheme_string_write,
-		.display = ao_scheme_string_display,
+#ifdef AO_SCHEME_FEATURE_BIGINT
+	[AO_SCHEME_BIGINT] = {
+		.write = ao_scheme_bigint_write,
+		.display = ao_scheme_bigint_write,
 	},
+#endif
 	[AO_SCHEME_INT] = {
 		.write = ao_scheme_int_write,
 		.display = ao_scheme_int_write,
@@ -60,18 +62,32 @@ static const struct ao_scheme_funcs ao_scheme_funcs[AO_SCHEME_NUM_TYPE] = {
 		.write = ao_scheme_bool_write,
 		.display = ao_scheme_bool_write,
 	},
-	[AO_SCHEME_BIGINT] = {
-		.write = ao_scheme_bigint_write,
-		.display = ao_scheme_bigint_write,
+	[AO_SCHEME_STRING] = {
+		.write = ao_scheme_string_write,
+		.display = ao_scheme_string_display,
 	},
+#ifdef AO_SCHEME_FEATURE_FLOAT
 	[AO_SCHEME_FLOAT] = {
 		.write = ao_scheme_float_write,
 		.display = ao_scheme_float_write,
 	},
+#endif
+#ifdef AO_SCHEME_FEATURE_VECTOR
 	[AO_SCHEME_VECTOR] = {
 		.write = ao_scheme_vector_write,
 		.display = ao_scheme_vector_display
 	},
+#endif
+};
+
+static void ao_scheme_invalid_write(ao_poly p) {
+	printf("??? 0x%04x ???", p);
+	ao_scheme_abort();
+}
+
+static const struct ao_scheme_funcs ao_scheme_invalid_funcs = {
+	.write = ao_scheme_invalid_write,
+	.display = ao_scheme_invalid_write,
 };
 
 static const struct ao_scheme_funcs *
@@ -81,25 +97,17 @@ funcs(ao_poly p)
 
 	if (type < AO_SCHEME_NUM_TYPE)
 		return &ao_scheme_funcs[type];
-	return NULL;
+	return &ao_scheme_invalid_funcs;
 }
 
-void
-ao_scheme_poly_write(ao_poly p)
+void (*ao_scheme_poly_write_func(ao_poly p))(ao_poly p)
 {
-	const struct ao_scheme_funcs *f = funcs(p);
-
-	if (f && f->write)
-		f->write(p);
+	return funcs(p)->write;
 }
 
-void
-ao_scheme_poly_display(ao_poly p)
+void (*ao_scheme_poly_display_func(ao_poly p))(ao_poly p)
 {
-	const struct ao_scheme_funcs *f = funcs(p);
-
-	if (f && f->display)
-		f->display(p);
+	return funcs(p)->display;
 }
 
 void *