From 25ec54b542f12633dde361e4d8038e7f5f6ee7c2 Mon Sep 17 00:00:00 2001 From: Keisuke Nishida Date: Sat, 7 Apr 2001 23:14:21 +0000 Subject: [PATCH] *** empty log message *** --- module/system/il/ghil.scm | 3 ++- module/system/il/macros.scm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/system/il/ghil.scm b/module/system/il/ghil.scm index bcd396069..db6d7cf2a 100644 --- a/module/system/il/ghil.scm +++ b/module/system/il/ghil.scm @@ -68,7 +68,8 @@ (define *macro-module* (resolve-module '(system il macros))) (define (ghil-primitive-macro? x) - (module-defined? *macro-module* x)) + (and (module-defined? *macro-module* x) + (procedure? (module-ref *macro-module* x)))) (define (ghil-macro-expander x) (module-ref *macro-module* x)) diff --git a/module/system/il/macros.scm b/module/system/il/macros.scm index 5c742f0d1..3e2d72b73 100644 --- a/module/system/il/macros.scm +++ b/module/system/il/macros.scm @@ -177,8 +177,8 @@ (define (@car x) `(@@ car ,x)) (define (@cdr x) `(@@ cdr ,x)) -(define (@set-car! x) `(@@ set-car! ,x)) -(define (@set-cdr! x) `(@@ set-cdr! ,x)) +(define (@set-car! x y) `(@@ set-car! ,x ,y)) +(define (@set-cdr! x y) `(@@ set-cdr! ,x ,y)) (define (@caar x) `(@@ car (@@ car ,x))) (define (@cadr x) `(@@ car (@@ cdr ,x)))