From ab381c841ae1c33fd3232d12a1327e071d9fd828 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 23 Jul 2016 15:11:32 +0200 Subject: [PATCH] mes.c: remove hacks --- mes.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/mes.c b/mes.c index f1b1db76..87a4a583 100644 --- a/mes.c +++ b/mes.c @@ -342,17 +342,8 @@ eval (scm *e, scm *a) scm *entry = assq (name, a); scm *x = cdar (defines); set_cdr_x (entry, cdr (define (x, a))); - if (eq_p (car (x), &symbol_define_macro) == &scm_t) - // HACK: macros are global - // 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 (""); + // if (eq_p (car (x), &symbol_define_macro) == &scm_t) + // set_cdr_x (last_pair (a), cons (cons (name, cdr (define (x, a))), &scm_nil)); defines = cdr (defines); } scm *fubar = cons (&scm_dot, &scm_dot); @@ -372,8 +363,8 @@ eval (scm *e, scm *a) return eval_quasiquote (cadr (e), add_unquoters (a)); if (car (e) == &symbol_cond) return evcon (cdr (e), a); - if (eq_p (car (e), &symbol_define) == &scm_t) - return define (e, a); + // if (eq_p (car (e), &symbol_define) == &scm_t) + // return define (e, a); if (eq_p (car (e), &symbol_define_macro) == &scm_t) return define (e, a); if ((macro = lookup_macro (car (e), a)) != &scm_f)