Just update to use ao_scheme_printf
Signed-off-by: Keith Packard <keithp@keithp.com>
#define DBG_MACRO 0
#if DBG_MACRO
#define DBG_MACRO 0
#if DBG_MACRO
+static int macro_scan_depth;
+static void indent(void)
{
int i;
for (i = 0; i < macro_scan_depth; i++)
{
int i;
for (i = 0; i < macro_scan_depth; i++)
struct ao_scheme_lambda *lambda;
ao_poly ret;
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))
switch (ao_scheme_poly_type(p)) {
case AO_SCHEME_ATOM:
if (ao_scheme_macro_push(p))
ret = AO_SCHEME_NIL;
break;
}
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););
if (p == AO_SCHEME_NIL)
return AO_SCHEME_NIL;
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);
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);
break;
case AO_SCHEME_CONS:
cons = ao_scheme_poly_cons(p);
p = AO_SCHEME_NIL;
break;
}
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));
a = ao_scheme_atom_intern((char *) atoms[an].name);
}
a = ao_scheme_atom_intern((char *) atoms[an].name);
}
in = fopen(argv[optind], "r");
if (!in) {
perror(argv[optind]);
exit(1);
}
in = fopen(argv[optind], "r");
if (!in) {
perror(argv[optind]);
exit(1);
}
- }
- if (!ao_scheme_read_eval_abort()) {
- fprintf(stderr, "eval failed\n");
- exit(1);
+ if (!ao_scheme_read_eval_abort()) {
+ fprintf(stderr, "eval failed\n");
+ exit(1);
+ }
+ fclose(in);
+ optind++;
}
/* Reduce to referenced values */
}
/* Reduce to referenced values */