Merge branch 'master' into branch-1.8

1 files changed, 122 insertions, 0 deletions

diff --git a/src/scheme/ao_scheme_poly.c b/src/scheme/ao_scheme_poly.c
new file mode 100644
index 00000000..553585db
--- /dev/null
+++ b/src/scheme/ao_scheme_poly.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include "ao_scheme.h"
+
+struct ao_scheme_funcs {
+	void (*write)(ao_poly);
+	void (*display)(ao_poly);
+};
+
+static const struct ao_scheme_funcs ao_scheme_funcs[AO_SCHEME_NUM_TYPE] = {
+	[AO_SCHEME_CONS] = {
+		.write = ao_scheme_cons_write,
+		.display = ao_scheme_cons_display,
+	},
+	[AO_SCHEME_STRING] = {
+		.write = ao_scheme_string_write,
+		.display = ao_scheme_string_display,
+	},
+	[AO_SCHEME_INT] = {
+		.write = ao_scheme_int_write,
+		.display = ao_scheme_int_write,
+	},
+	[AO_SCHEME_ATOM] = {
+		.write = ao_scheme_atom_write,
+		.display = ao_scheme_atom_write,
+	},
+	[AO_SCHEME_BUILTIN] = {
+		.write = ao_scheme_builtin_write,
+		.display = ao_scheme_builtin_write,
+	},
+	[AO_SCHEME_FRAME] = {
+		.write = ao_scheme_frame_write,
+		.display = ao_scheme_frame_write,
+	},
+	[AO_SCHEME_FRAME_VALS] = {
+		.write = NULL,
+		.display = NULL,
+	},
+	[AO_SCHEME_LAMBDA] = {
+		.write = ao_scheme_lambda_write,
+		.display = ao_scheme_lambda_write,
+	},
+	[AO_SCHEME_STACK] = {
+		.write = ao_scheme_stack_write,
+		.display = ao_scheme_stack_write,
+	},
+	[AO_SCHEME_BOOL] = {
+		.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_FLOAT] = {
+		.write = ao_scheme_float_write,
+		.display = ao_scheme_float_write,
+	},
+	[AO_SCHEME_VECTOR] = {
+		.write = ao_scheme_vector_write,
+		.display = ao_scheme_vector_display
+	},
+};
+
+static const struct ao_scheme_funcs *
+funcs(ao_poly p)
+{
+	uint8_t	type = ao_scheme_poly_type(p);
+
+	if (type < AO_SCHEME_NUM_TYPE)
+		return &ao_scheme_funcs[type];
+	return NULL;
+}
+
+void
+ao_scheme_poly_write(ao_poly p)
+{
+	const struct ao_scheme_funcs *f = funcs(p);
+
+	if (f && f->write)
+		f->write(p);
+}
+
+void
+ao_scheme_poly_display(ao_poly p)
+{
+	const struct ao_scheme_funcs *f = funcs(p);
+
+	if (f && f->display)
+		f->display(p);
+}
+
+void *
+ao_scheme_ref(ao_poly poly) {
+	if (poly == AO_SCHEME_NIL)
+		return NULL;
+	if (poly & AO_SCHEME_CONST)
+		return (void *) (ao_scheme_const + (poly & AO_SCHEME_REF_MASK) - 4);
+	return (void *) (ao_scheme_pool + (poly & AO_SCHEME_REF_MASK) - 4);
+}
+
+ao_poly
+ao_scheme_poly(const void *addr, ao_poly type) {
+	const uint8_t	*a = addr;
+	if (a == NULL)
+		return AO_SCHEME_NIL;
+	if (AO_SCHEME_IS_CONST(a))
+		return AO_SCHEME_CONST | (a - ao_scheme_const + 4) | type;
+	return (a - ao_scheme_pool + 4) | type;
+}