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

mes.c: remove hacks

Browse source
This commit is contained in:
Jan Nieuwenhuizen 2016-07-23 15:11:32 +02:00
parent 5126e16e66
commit ab381c841a
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mes.c
View file

@ -342,17 +342,8 @@ eval (scm *e, scm *a)
scm *entry = assq (name, a); scm *entry = assq (name, a);
scm *x = cdar (defines); scm *x = cdar (defines);
set_cdr_x (entry, cdr (define (x, a))); set_cdr_x (entry, cdr (define (x, a)));
if (eq_p (car (x), &symbol_define_macro) == &scm_t) // if (eq_p (car (x), &symbol_define_macro) == &scm_t)
// HACK: macros are global // set_cdr_x (last_pair (a), cons (cons (name, cdr (define (x, a))), &scm_nil));
// should we go back to (*macro* . ...) entry?
// scm *last = last_pair (a);
// printf ("\n LAST=");
// display (last);
// puts ("");
set_cdr_x (last_pair (a), cons (cons (name, cdr (define (x, a))), &scm_nil));
// printf ("a=");
// display (a);
// puts ("");
defines = cdr (defines); defines = cdr (defines);
} }
scm *fubar = cons (&scm_dot, &scm_dot); scm *fubar = cons (&scm_dot, &scm_dot);
@ -372,8 +363,8 @@ eval (scm *e, scm *a)
return eval_quasiquote (cadr (e), add_unquoters (a)); return eval_quasiquote (cadr (e), add_unquoters (a));
if (car (e) == &symbol_cond) if (car (e) == &symbol_cond)
return evcon (cdr (e), a); return evcon (cdr (e), a);
if (eq_p (car (e), &symbol_define) == &scm_t) // if (eq_p (car (e), &symbol_define) == &scm_t)
return define (e, a); // return define (e, a);
if (eq_p (car (e), &symbol_define_macro) == &scm_t) if (eq_p (car (e), &symbol_define_macro) == &scm_t)
return define (e, a); return define (e, a);
if ((macro = lookup_macro (car (e), a)) != &scm_f) if ((macro = lookup_macro (car (e), a)) != &scm_f)