X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_make_const.c;h=8561bf0b47d39302846f452ea3a7a4427a3ae6d4;hb=f8a967959b2f5ca3486ab3422f30fe4ad4ba17a8;hp=d0a51ec8e9554846f8b5733bf16ff0845e2644c7;hpb=4bfce37e7567d9c2a09ea4da8113e7639516ed6e;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_make_const.c b/src/scheme/ao_scheme_make_const.c
index d0a51ec8..8561bf0b 100644
--- a/src/scheme/ao_scheme_make_const.c
+++ b/src/scheme/ao_scheme_make_const.c
@@ -80,7 +80,7 @@ ao_fec_crc_byte(uint8_t byte, uint16_t crc)
 	return crc;
 }
 
-uint16_t
+static uint16_t
 ao_fec_crc(const uint8_t *bytes, uint8_t len)
 {
 	uint16_t	crc = AO_FEC_CRC_INIT;
@@ -97,7 +97,7 @@ struct ao_scheme_macro_stack {
 
 struct ao_scheme_macro_stack *macro_stack;
 
-int
+static int
 ao_scheme_macro_push(ao_poly p)
 {
 	struct ao_scheme_macro_stack *m = macro_stack;
@@ -114,7 +114,7 @@ ao_scheme_macro_push(ao_poly p)
 	return 0;
 }
 
-void
+static void
 ao_scheme_macro_pop(void)
 {
 	struct ao_scheme_macro_stack *m = macro_stack;
@@ -125,9 +125,9 @@ ao_scheme_macro_pop(void)
 
 #define DBG_MACRO 0
 #if DBG_MACRO
-int macro_scan_depth;
+static int macro_scan_depth;
 
-void indent(void)
+static void indent(void)
 {
 	int i;
 	for (i = 0; i < macro_scan_depth; i++)
@@ -141,7 +141,7 @@ void indent(void)
 ao_poly
 ao_has_macro(ao_poly p);
 
-ao_poly
+static ao_poly
 ao_macro_test_get(ao_poly atom)
 {
 	ao_poly	*ref = ao_scheme_atom_ref(atom, NULL);
@@ -150,14 +150,14 @@ ao_macro_test_get(ao_poly atom)
 	return AO_SCHEME_NIL;
 }
 
-ao_poly
+static ao_poly
 ao_is_macro(ao_poly p)
 {
 	struct ao_scheme_builtin	*builtin;
 	struct ao_scheme_lambda	*lambda;
 	ao_poly ret;
 
-	MACRO_DEBUG(indent(); printf ("is macro "); ao_scheme_poly_write(p); printf("\n"); ++macro_scan_depth);
+	MACRO_DEBUG(indent(); ao_scheme_printf ("is macro %v\n", p); ++macro_scan_depth);
 	switch (ao_scheme_poly_type(p)) {
 	case AO_SCHEME_ATOM:
 		if (ao_scheme_macro_push(p))
@@ -192,7 +192,7 @@ ao_is_macro(ao_poly p)
 		ret = AO_SCHEME_NIL;
 		break;
 	}
-	MACRO_DEBUG(--macro_scan_depth;	indent(); printf ("... "); ao_scheme_poly_write(ret); printf("\n"));
+	MACRO_DEBUG(--macro_scan_depth;	indent(); ao_scheme_printf ("... %v\n", ret););
 	return ret;
 }
 
@@ -207,11 +207,11 @@ ao_has_macro(ao_poly p)
 	if (p == AO_SCHEME_NIL)
 		return AO_SCHEME_NIL;
 
-	MACRO_DEBUG(indent(); printf("has macro "); ao_scheme_poly_write(p); printf("\n"); ++macro_scan_depth);
+	MACRO_DEBUG(indent(); ao_scheme_printf("has macro %v\n", p); ++macro_scan_depth);
 	switch (ao_scheme_poly_type(p)) {
 	case AO_SCHEME_LAMBDA:
 		lambda = ao_scheme_poly_lambda(p);
-		p = ao_has_macro(lambda->code);
+		p = ao_has_macro(ao_scheme_poly_cons(lambda->code)->cdr);
 		break;
 	case AO_SCHEME_CONS:
 		cons = ao_scheme_poly_cons(p);
@@ -220,7 +220,7 @@ ao_has_macro(ao_poly p)
 
 		list = cons->cdr;
 		p = AO_SCHEME_NIL;
-		while (list != AO_SCHEME_NIL && ao_scheme_poly_type(list) == AO_SCHEME_CONS) {
+		while (ao_scheme_is_pair(list)) {
 			cons = ao_scheme_poly_cons(list);
 			m = ao_has_macro(cons->car);
 			if (m) {
@@ -235,7 +235,7 @@ ao_has_macro(ao_poly p)
 		p = AO_SCHEME_NIL;
 		break;
 	}
-	MACRO_DEBUG(--macro_scan_depth;	indent(); printf("... "); ao_scheme_poly_write(p); printf("\n"));
+	MACRO_DEBUG(--macro_scan_depth;	indent(); ao_scheme_printf("... %v\n", p));
 	return p;
 }
 
@@ -269,19 +269,20 @@ ao_scheme_seen_builtin(struct ao_scheme_builtin *b)
 	return 0;
 }
 
-int
-ao_scheme_read_eval_abort(void)
+static int
+ao_scheme_read_eval_abort(FILE *read_file)
 {
-	ao_poly	in, out = AO_SCHEME_NIL;
+	ao_poly	in;
+
 	for(;;) {
-		in = ao_scheme_read();
+		in = ao_scheme_read(read_file);
 		if (in == _ao_scheme_atom_eof)
 			break;
-		out = ao_scheme_eval(in);
-		if (ao_scheme_exception)
+		(void) ao_scheme_eval(in);
+		if (ao_scheme_exception) {
+			ao_scheme_fprintf(stderr, "make_const failed on %v\n", in);
 			return 0;
-		ao_scheme_poly_write(out);
-		putchar ('\n');
+		}
 	}
 	return 1;
 }
@@ -297,7 +298,7 @@ struct feature {
 static struct feature *enable;
 static struct feature *disable;
 
-void
+static void
 ao_scheme_add_feature(struct feature **list, char *name)
 {
 	struct feature *feature = malloc (sizeof (struct feature) + strlen(name) + 1);
@@ -307,8 +308,11 @@ ao_scheme_add_feature(struct feature **list, char *name)
 }
 
 static bool
-ao_scheme_has_feature(struct feature *list, const char *name)
+_ao_scheme_has_feature(struct feature *list, const char *name, bool skip_undef)
 {
+	if (skip_undef && !strcmp(name, "UNDEF"))
+		return false;
+
 	while (list) {
 		if (!strcmp(list->name, name))
 			return true;
@@ -317,6 +321,18 @@ ao_scheme_has_feature(struct feature *list, const char *name)
 	return false;
 }
 
+static bool
+ao_scheme_has_undef(struct feature *list)
+{
+	return _ao_scheme_has_feature(list, "UNDEF", false);
+}
+
+static bool
+ao_scheme_has_feature(struct feature *list, const char *name)
+{
+	return _ao_scheme_has_feature(list, name, true);
+}
+
 static void
 ao_scheme_add_features(struct feature **list, const char *names)
 {
@@ -359,6 +375,7 @@ main(int argc, char **argv)
 	ao_poly	val;
 	struct ao_scheme_atom	*a;
 	struct ao_scheme_builtin	*b;
+	struct feature			*d;
 	int	in_atom = 0;
 	char	*out_name = NULL;
 	int	c;
@@ -394,6 +411,7 @@ main(int argc, char **argv)
 
 	prev_func = _builtin_last;
 	target_func = 0;
+	b = NULL;
 	for (f = 0; f < (int) N_FUNC; f++) {
 		if (ao_scheme_has_feature(enable, funcs[f].feature) || !ao_scheme_has_feature(disable, funcs[f].feature)) {
 			if (funcs[f].func != prev_func) {
@@ -422,16 +440,26 @@ main(int argc, char **argv)
 			a = ao_scheme_atom_intern((char *) atoms[an].name);
 	}
 
-	if (argv[optind]){
+	while (argv[optind]) {
 		in = fopen(argv[optind], "r");
 		if (!in) {
 			perror(argv[optind]);
 			exit(1);
 		}
+		if (!ao_scheme_read_eval_abort(in)) {
+			fprintf(stderr, "eval failed\n");
+			exit(1);
+		}
+		fclose(in);
+		optind++;
 	}
-	if (!ao_scheme_read_eval_abort()) {
-		fprintf(stderr, "eval failed\n");
-		exit(1);
+
+	if (!ao_scheme_has_undef(enable) && ao_scheme_has_undef(disable)) {
+		struct ao_scheme_cons cons;
+
+		cons.car = _ao_scheme_atom_undef;
+		cons.cdr = AO_SCHEME_NIL;
+		ao_scheme_do_undef(&cons);
 	}
 
 	/* Reduce to referenced values */
@@ -442,10 +470,10 @@ main(int argc, char **argv)
 
 		val = ao_has_macro(vals->vals[f].val);
 		if (val != AO_SCHEME_NIL) {
-			printf("error: function %s contains unresolved macro: ",
-			       ao_scheme_poly_atom(vals->vals[f].atom)->name);
-			ao_scheme_poly_write(val);
-			printf("\n");
+			fprintf(stderr, "error: function %s contains unresolved macro: ",
+				ao_scheme_poly_atom(vals->vals[f].atom)->name);
+			ao_scheme_poly_write(stderr, val, true);
+			fprintf(stderr, "\n");
 			exit(1);
 		}
 
@@ -467,6 +495,9 @@ main(int argc, char **argv)
 
 	fprintf(out, "/* Generated file, do not edit */\n\n");
 
+	for (d = disable; d; d = d->next)
+		fprintf(out, "#undef AO_SCHEME_FEATURE_%s\n", d->name);
+
 	fprintf(out, "#define AO_SCHEME_POOL_CONST %d\n", ao_scheme_top);
 	fprintf(out, "extern const uint8_t ao_scheme_const[AO_SCHEME_POOL_CONST] __attribute__((aligned(4)));\n");
 	fprintf(out, "#define ao_builtin_atoms 0x%04x\n", ao_scheme_atom_poly(ao_scheme_atoms));