Ticket #444: nested-syntax.patch

expand.scm

@@ -94 +94 @@
                           (lookup x se)
                           (getp x '##core#macro-alias) ) ) )
               (cond ((getp x '##core#real-name))
+                    ((getp x '##core#primitive))
                     ((and alias (not (assq x se)))
                      (##sys#alias-global-hook x #f #f))
                     ((not x2) x)

tests/compiler-tests.scm

@@ -99 +99 @@
   (strlen-safe-macro* "hello, world")
   (strlen-primitive-macro "hello, world"))
 
+;; Type specifiers and variable names in foreign-lambda in macros
+;; are incorrectly renamed in modules, too.
+(foreign-declare "void foo(void *abc) { printf(\"hi\\n\"); }")
+
+(module foo ()
+  (import chicken scheme foreign) ; "chicken" includes an export for "void"
+  
+  (let-syntax ((fl
+                (syntax-rules ()
+                  ((_)
+                   (foreign-lambda void foo (c-pointer void)))))
+               (fl*
+                (syntax-rules ()
+                  ((_)
+                   (foreign-lambda* void (((c-pointer void) a))
+                                    "C_return(a);"))))
+               (fp
+                (syntax-rules ()
+                  ((_)
+                   (foreign-primitive void (((c-pointer void) a))
+                                      "C_return(a);")))))
+    (fl)
+    (fl*)
+    (fp)))
+
+
 ;;; compiler-syntax for map/for-each must be careful when the
 ;   operator may have side-effects (currently only lambda exprs and symbols
 ;   are allowed)
@@ -142 +168 @@
     (define (baz)
       (bar a: #t))
     baz)
-  bar)
+  bar)
+ No newline at end of file