~ chicken-core (chicken-5) c75bb19f030581480f2ae4912f708415592ca09d


commit c75bb19f030581480f2ae4912f708415592ca09d
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sat Feb 24 11:21:39 2018 +0100
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Mon Feb 26 18:54:46 2018 +1300

    Drop renaming code that was never possibly being used
    
    This was changed a while ago, and it turns out that the "fix" was
    actually disabling some code because assq will return a pair, not a
    symbol, so the symbol? check would always fail.
    
    The code in the else branch that would always trigger is duplicated in
    the main cond's else branch, so we can drop the entire assq cond
    clause.
    
    Signed-off-by: Evan Hanson <evhan@foldling.org>

diff --git a/expand.scm b/expand.scm
index 5cacd1e9..337bcf2f 100644
--- a/expand.scm
+++ b/expand.scm
@@ -851,17 +851,6 @@
 		(lambda (a) 
 		  (dd `(RENAME/RENV: ,sym --> ,(cdr a)))
 		  (cdr a)))
-	       ((assq sym se) =>
-		(lambda (a)
-		  (cond ((symbol? a)
-			 (dd `(RENAME/SE: ,sym --> ,a))
-			 (set! renv (cons (cons sym a) renv))
-			 a)
-			(else
-			 (let ((a2 (macro-alias sym se)))
-			   (dd `(RENAME/SE/MACRO: ,sym --> ,a2))
-			   (set! renv (cons (cons sym a2) renv))
-			   a2)))))
 	       (else
 		(let ((a (macro-alias sym se)))
 		  (dd `(RENAME: ,sym --> ,a))
Trap