Import Upstream version 3a1upstream/3a1

1 files changed, 20 insertions, 20 deletions

diff --git a/mwexpand.scm b/mwexpand.scm
index 9dea34b..07acf1d 100644
--- a/mwexpand.scm
+++ b/mwexpand.scm
@@ -29,7 +29,7 @@
 
 (define mw:quit             ; assigned by macwork:expand
   (lambda (v) v))
-
+;@
 (define (macwork:expand def-or-exp)
   (call-with-current-continuation
    (lambda (k)
@@ -329,30 +329,30 @@
 
 (define (mw:let-syntax exp env)
   (if (and (> (mw:safe-length exp) 2)
-	   (comlist:every (lambda (binding)
-		    (and (pair? binding)
-			 (symbol? (car binding))
-			 (pair? (cdr binding))
-			 (null? (cddr binding))))
-		    (cadr exp)))
+	   (mw:every (lambda (binding)
+		       (and (pair? binding)
+			    (symbol? (car binding))
+			    (pair? (cdr binding))
+			    (null? (cddr binding))))
+		     (cadr exp)))
       (mw:body (cddr exp)
-	      (mw:syntax-extend env
-				(map car (cadr exp))
-				(map (lambda (spec)
-				       (mw:compile-transformer-spec
-					spec
-					env))
-				     (map cadr (cadr exp)))))
+	       (mw:syntax-extend env
+				 (map car (cadr exp))
+				 (map (lambda (spec)
+					(mw:compile-transformer-spec
+					 spec
+					 env))
+				      (map cadr (cadr exp)))))
       (mw:error "Malformed let-syntax" exp env)))
 
 (define (mw:letrec-syntax exp env)
   (if (and (> (mw:safe-length exp) 2)
-	   (comlist:every (lambda (binding)
-		    (and (pair? binding)
-			 (symbol? (car binding))
-			 (pair? (cdr binding))
-			 (null? (cddr binding))))
-		    (cadr exp)))
+	   (mw:every (lambda (binding)
+		       (and (pair? binding)
+			    (symbol? (car binding))
+			    (pair? (cdr binding))
+			    (null? (cddr binding))))
+		     (cadr exp)))
       (let ((env (mw:syntax-extend env
 				   (map car (cadr exp))
 				   (map (lambda (id)