#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++)
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))
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;
}
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);
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) {
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;
}
out = ao_scheme_eval(in);
if (ao_scheme_exception)
return 0;
- ao_scheme_poly_write(out);
+ ao_scheme_poly_write(out, true);
putchar ('\n');
}
return 1;
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()) {
- 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 */
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);
+ ao_scheme_poly_write(val, true);
printf("\n");
exit(1);
}