Ticket #944: 0001-Fix-944-by-making-the-behvior-of-macro-renamed-defin.patch

chicken-syntax.scm

@@ -348 +348 @@
    (##sys#er-transformer
     (lambda (form r c)
       (##sys#check-syntax 'define-values form '(_ #(variable 0) _))
-      (for-each (cut ##sys#register-export <> (##sys#current-module)) (cadr form))
+      (for-each (lambda (nm)
+                  (let ((name (##sys#get nm '##core#macro-alias nm)))
+                    (##sys#register-export name (##sys#current-module))))
+                (cadr form))
       `(,(r 'set!-values) ,@(cdr form))))))
 
 (##sys#extend-macro-environment

expand.scm

@@ -981 +981 @@
               (body (cddr form)) )
           (cond ((not (pair? head))
                  (##sys#check-syntax 'define form '(_ symbol . #(_ 0 1)))
-                 (##sys#register-export head (##sys#current-module))
+                 (let ((name (or (getp head '##core#macro-alias) head)))
+                   (##sys#register-export name (##sys#current-module)))
                  (when (c (r 'define) head)
                    (##sys#defjam-error x))
                  `(##core#set! 
@@ -1005 +1006 @@
         (cond ((not (pair? head))
                (##sys#check-syntax 'define-syntax head 'symbol)
                (##sys#check-syntax 'define-syntax body '#(_ 1))
-               (##sys#register-export head (##sys#current-module))
+               (let ((name (or (getp head '##core#macro-alias) head)))
+                 (##sys#register-export name (##sys#current-module)))
                (when (c (r 'define-syntax) head)
                  (##sys#defjam-error form))
                `(##core#define-syntax ,head ,(car body)))

tests/syntax-tests.scm

@@ -1054 +1054 @@
     (lambda (e r c) '(quote *)))))
 
 (import rename-builtins)
-(assert (eq? '* (strip-syntax-on-*)))
- No newline at end of file
+(assert (eq? '* (strip-syntax-on-*)))
+
+;; #944: macro-renamed defines mismatch with the names recorded in module
+;;       definitions, causing the module to be unresolvable.
+
+(module foo ()
+  (import chicken scheme)
+  (define-syntax bar
+    (syntax-rules ()
+      ((_) (begin (define req 1) (display req) (newline)))))
+  (bar))
+
+;; The fix for the above bug causes the req to be defined at toplevel,
+;; unhygienically.  The test below should probably be enabled and this
+;; behavior fixed.  R5RS seems to allow the current behavior though (?),
+;; and some Schemes (at least Gauche) behave the same way.  I think it's
+;; broken, since it's unhygienic.
+#;(module foo ()
+  (import chicken scheme)
+  (define req 1)
+  (define-syntax bar
+    (syntax-rules ()
+      ((_) (begin (define req 2) (display req) (newline)))))
+  (bar)
+  (assert (eq? req 1)))
+ No newline at end of file