~ chicken-core (chicken-5) 785c5e9c5da5e4e3e6518c39bbf03b47bfb1eb47


commit 785c5e9c5da5e4e3e6518c39bbf03b47bfb1eb47
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jul 19 12:02:30 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jul 19 12:02:30 2011 +0200

    strip location identifier when ensuring transformer

diff --git a/compiler.scm b/compiler.scm
index 3e5b6b35..86adcde1 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -668,7 +668,7 @@
 					     se
 					     (##sys#ensure-transformer
 					      (##sys#eval/meta (cadr b))
-					      (car b))))
+					      (##sys#strip-syntax (car b)))))
 					  (cadr x) )
 				     se) ) )
 			   (walk
@@ -683,7 +683,7 @@
 					   #f
 					   (##sys#ensure-transformer
 					    (##sys#eval/meta (cadr b))
-					    (car b))))
+					    (##sys#strip-syntax (car b)))))
 					(cadr x) ) )
 			       (se2 (append ms se)) )
 			  (for-each 
@@ -735,7 +735,7 @@
 				(##sys#cons
 				 (##sys#ensure-transformer
 				  (##sys#eval/meta body)
-				  var)
+				  (##sys#strip-syntax var))
 				 (##sys#current-environment))))
 			  (walk 
 			   (if ##sys#enable-runtime-macros
@@ -761,7 +761,7 @@
 					(and (pair? (cdr b))
 					     (cons (##sys#ensure-transformer
 						    (##sys#eval/meta (cadr b))
-						    (car b))
+						    (##sys#strip-syntax (car b)))
 						   se))
 					(##sys#get name '##compiler#compiler-syntax) ) ) )
 				   (cadr x))))
diff --git a/eval.scm b/eval.scm
index af7dbd2a..35fdeb8f 100644
--- a/eval.scm
+++ b/eval.scm
@@ -557,7 +557,7 @@
 					      se
 					      (##sys#ensure-transformer
 					       (##sys#eval/meta (cadr b))
-					       (car b))))
+					       (##sys#strip-syntax (car b)))))
 					   (cadr x) ) 
 				      se) ) )
 			    (compile
@@ -571,7 +571,7 @@
 					     #f
 					     (##sys#ensure-transformer
 					      (##sys#eval/meta (cadr b))
-					      (car b))))
+					      (##sys#strip-syntax (car b)))))
 					  (cadr x) ) )
 				 (se2 (append ms se)) )
 			    (for-each 
Trap