Ticket #444: ir-fix.patch

expand.scm

@@ -770 +770 @@
              (lambda (a)
                (cond ((symbol? a)
                       (dd `(RENAME/LOOKUP: ,sym --> ,a))
+                      (set! renv (cons (cons sym a) renv))
                       a)
                      (else
                       (let ((a2 (macro-alias sym se)))
@@ -824 +825 @@
                 r)
             ")")
         r))
+    (define (assq-reverse s l)
+      (cond
+       ((null? l) #f)
+       ((eq? (cdar l) s) (car l))
+       (else (assq-reverse s (cdr l)))))
     (define (mirror-rename sym)
       (cond ((pair? sym)
              (cons (mirror-rename (car sym)) (mirror-rename (cdr sym))))
@@ -836 +842 @@
                       (lambda (name)
                         (dd "STRIP SYNTAX ON " sym " ---> " name)
                         name))
+                     ((assq-reverse sym renv) =>
+                      (lambda (a)
+                        (dd "REVERSING RENAME: " sym " --> " (car a)) (car a)))
                      ((not renamed)
                       (dd "IMPLICITLY RENAMED: " sym) (rename sym))
                      ((pair? renamed)

tests/syntax-tests.scm

@@ -579 +579 @@
       (1 ==> (lambda (x) x))
       (else 'yep))))
 
+;; Literal quotation of a symbol, injected or not, should always result in that symbol
+(module ir-se-test (run)
+  (import chicken scheme)
+  (define-syntax run
+    (ir-macro-transformer
+     (lambda (e i c)
+       `(quote ,(i 'void))))))
+
+(import ir-se-test)
+(t 'void (run))
 
 ;;; local definitions