Changeset 31145 for lang/scheme/3imp/macro.scm

Timestamp:

03/13/09 17:59:53 (4 years ago)

Author:

mokehehe

Message:

ソース圧縮
whenマクロ追加
elseのないifを許容

Files:

• lang/scheme/3imp/macro.scm (modified) (3 diffs)

lang/scheme/3imp/macro.scm

@@ -6 +6 @@
   (hash-table-put! *macro-table* name f))
 
+(define-macro (define-special-form name . f)
+  (if (pair? name)
+      `(define-special-form ,(car name) (lambda (%sp% ,@(cdr name)) ,@f))
+    `(add-macro ',name ,(car f))))
+
 (define-macro (define-builtin-macro name . f)
   (if (pair? name)
@@ -11 +16 @@
     `(add-macro ',name ,(evaluate (car f)))))
 
-(define-macro (define-special-form name . f)
-  (if (pair? name)
-      `(define-special-form ,(car name) (lambda (%sp% ,@(cdr name)) ,@f))
-    `(add-macro ',name ,(car f))))
-
 (define (macro? name)
-  (if (hash-table-exists? *macro-table* name)
-      (hash-table-get *macro-table* name)
-    #f))
+  (and (hash-table-exists? *macro-table* name)
+       (hash-table-get *macro-table* name)))
 
 (define (all f . args)
@@ -33 +32 @@
         (let ((trns
                (cond ((macro? name) => (lambda (c)
-                                         (if (procedure? c)
+                                         (if (primitive-function? c)
                                              (apply c s (cdr x))
                                            (vm-apply s c (cdr x)))))