Compile macros as the macro_type

scheme/cyclone/cgen.sld

@@ -182,6 +182,8 @@
       "\");\n"
       )))
 
+(define (st:->var trace)
+  (cdr trace))
 ;; END st helpers
 
 ;;; Compilation routines.
@@ -987,6 +989,7 @@
              (closure->fv exp))) ; Note these are not necessarily symbols, but in cc form
          (cv-name (mangle (gensym 'c)))
          (lid (allocate-lambda (c-compile-lambda lam trace)))
+         (macro? (assoc (st:->var trace) (get-macros)))
          (create-nclosure (lambda ()
            (string-append
              "closureN_type " cv-name ";\n"
@@ -1005,8 +1008,15 @@
                            (car vars) ";\n"
                    (loop (+ i 1) (cdr vars))))))))
          (create-mclosure (lambda () 
+           (let ((prefix 
+                    (if macro?
+                      "mmacro"
                       (string-append 
-            "mclosure" (number->string (length free-vars)) "(" cv-name ", "
+                        "mclosure" 
+                        (number->string (length free-vars))))))
+             (string-append
+              prefix
+              "(" cv-name ", "
               ;; NOTE:
               ;; Hopefully will not cause issues with varargs when casting to
               ;; generic function type below. Works fine in gcc, not sure if 
@@ -1016,7 +1026,8 @@
               (string-join free-vars ", ")
               ");"
               cv-name ".num_args = " (number->string (compute-num-args lam)) ";"
-            ))))
+              )))))
+  ;(trace:info (list 'JAE-DEBUG trace macro?))
   (c-code/vars
     (string-append "&" cv-name)
     (list 

test2.scm

@@ -47,4 +47,4 @@
 (define x 1)
 (write x)
 (write
-  (eval 'x))
+  (eval '(or 1 2 x)))