artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

no closuring in macro body...

Browse source
This commit is contained in:
Jan Nieuwenhuizen 2016-07-17 23:07:35 +02:00
parent bba631edcd
commit 005f146b68
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mes.c
View file

@ -455,12 +455,14 @@ closure_body (scm *body, scm *a)
} }
if (eq_p (car (e), &scm_symbol_define) == &scm_t if (eq_p (car (e), &scm_symbol_define) == &scm_t
// FIXME: closure inside macros? // FIXME: closure inside macros?
|| eq_p (car (e), &scm_symbol_define_macro) == &scm_t // || eq_p (car (e), &scm_symbol_define_macro) == &scm_t
|| eq_p (car (e), &scm_symbol_set_x) == &scm_t) { || eq_p (car (e), &scm_symbol_set_x) == &scm_t) {
if (cadr (e)->type == PAIR && cadr (e) == &scm_nil) { if (cadr (e)->type == PAIR && cadr (e) == &scm_nil) {
scm *p = pairlis (cdadr (e), cdadr (e), cons (cons (caar (e), caar (e)), a)); scm *p = pairlis (cdadr (e), cdadr (e), cons (cons (caar (e), caar (e)), a));
return cons (cons (car (e), cons (cadr (e), closure_body (cddr (e), p))), cdr (body)); return cons (cons (car (e), cons (cadr (e), closure_body (cddr (e), p))), cdr (body));
} }
if (eq_p (car (e), &scm_symbol_define_macro) == &scm_t)
return cons (e, closure_body (cdr (body), a));
return cons (cons (car (e), cons (cadr (e), closure_body (cddr (e), a))), cdr (body)); return cons (cons (car (e), cons (cadr (e), closure_body (cddr (e), a))), cdr (body));
} }
} }
@ -1338,6 +1340,7 @@ define (scm *x, scm *a)
puts (""); puts ("");
#endif #endif
scm *e = cdr (x); scm *e = cdr (x);
//return cons (caadr (x), make_lambda (cdadr (x), cddr (x)));;
scm *p = pairlis (cadr (x), cadr (x), a); scm *p = pairlis (cadr (x), cadr (x), a);
// eval for closure_body // eval for closure_body
return cons (caadr (x), eval (make_lambda (cdadr (x), cddr (x)), p)); return cons (caadr (x), eval (make_lambda (cdadr (x), cddr (x)), p));
@ -1367,12 +1370,14 @@ define_macro (scm *x, scm *a)
scm *macro; scm *macro;
if (atom_p (cadr (x)) != &scm_f) if (atom_p (cadr (x)) != &scm_f)
//macro = cons (cadr (x), eval (caddr (x), a)); //macro = cons (cadr (x), eval (caddr (x), a));
macro = cons (cadr (x), eval (caddr (x), cons (cons (cadr (x), cadr (x)), a))); macro = cons (cadr (x), caddr (x));
// FIXME: closure inside macros?
//macro = cons (cadr (x), eval (caddr (x), cons (cons (cadr (x), cadr (x)), a)));
else { else {
scm *p = pairlis (cadr (x), cadr (x), a); scm *p = pairlis (cadr (x), cadr (x), a);
//macro = cons (caadr(x), make_lambda (cdadr (x), cddr (x))); macro = cons (caadr(x), make_lambda (cdadr (x), cddr (x)));
// FIXME: closure inside macros? // FIXME: closure inside macros?
macro = cons (caadr(x), eval (make_lambda (cdadr (x), cddr (x)), p)); // macro = cons (caadr(x), eval (make_lambda (cdadr (x), cddr (x)), p));
} }
set_cdr_x (macros, cons (macro, cdr (macros))); set_cdr_x (macros, cons (macro, cdr (macros)));
return a; return a;