From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 6 Dec 2018 07:42:49 +0000 (-0800)
Subject: Fix some minor bugs in syntax renaming.
X-Git-Tag: mit-scheme-pucked-10.1.7~3^2~24
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e793bda9b43dc0fdcc583543a716700cea230792;p=mit-scheme.git

Fix some minor bugs in syntax renaming.
---

diff --git a/src/runtime/syntax-rename.scm b/src/runtime/syntax-rename.scm
index cf0138263..c6b0b9347 100644
--- a/src/runtime/syntax-rename.scm
+++ b/src/runtime/syntax-rename.scm
@@ -121,9 +121,11 @@ USA.
 			  bound)))
     (for-each (lambda (rename)
 		(let ((original (rename->original rename)))
-		  (if (not (any (lambda (rename*)
-				  (eq? original (rename->original rename*)))
-				free))
+		  (if (and (symbol? original)
+			   (not (any (lambda (rename*)
+				       (eq? original
+					    (rename->original rename*)))
+				     free)))
 		      (mark-safe! rename original))))
 	      bound)
     free))
@@ -152,11 +154,11 @@ USA.
 	  (if entry
 	      (cdr entry)
 	      (let ((finalized
-		     (symbol "." original
+		     (symbol "." (identifier->symbol original)
 			     "." frame-id
 			     "-" (length (cdr bucket)))))
 		(set-cdr! bucket
-			  (cons (cons original finalized)
+			  (cons (cons frame-id finalized)
 				(cdr bucket)))
 		finalized)))))