# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1557070896 14400
# Node ID e48985ef1aac7a0190cb6abfc416d979dd4b9e36
# Parent  5e42deadf7733c68b3b418ec69fec71281433f04# Parent  28724d30efef19dacec09f446d6b9a2b76ec8f85
Merge.

diff -r 28724d30efef -r e48985ef1aac src/clos.lisp
--- a/src/clos.lisp	Tue Apr 30 17:06:46 2019 -0400
+++ b/src/clos.lisp	Sun May 05 11:41:36 2019 -0400
@@ -26,7 +26,7 @@
   automatically be filled in with sane values if they aren't given.
 
   "
-  (destructuring-bind (name &key (conc-name (symb name '-)))
+  (destructuring-bind (name &key conc-name)
       (ensure-list name-and-options)
     `(defclass ,name ,direct-superclasses
        ,(mapcar (curry #'build-slot-definition conc-name) slots)
diff -r 28724d30efef -r e48985ef1aac src/debugging.lisp
--- a/src/debugging.lisp	Tue Apr 30 17:06:46 2019 -0400
+++ b/src/debugging.lisp	Sun May 05 11:41:36 2019 -0400
@@ -32,7 +32,12 @@
 
   "
   `(prog1
-    (progn ,@(mapcar (lambda (arg) `(pr ',arg ,arg)) args))
+    (progn ,@(mapcar (lambda (arg)
+                       (with-gensyms (a)
+                         `(let ((,a ,arg))
+                            (pr ',arg ,a)
+                            ,a)))
+                     args))
     (terpri)
     (finish-output)))
 
diff -r 28724d30efef -r e48985ef1aac src/iterate.lisp
--- a/src/iterate.lisp	Tue Apr 30 17:06:46 2019 -0400
+++ b/src/iterate.lisp	Sun May 05 11:41:36 2019 -0400
@@ -722,7 +722,7 @@
 
   "
   ;; TODO: result-type
-  (alexandria:with-gensyms (min value m-value tail)
+  (with-gensyms (min value m-value tail)
     (let ((result (or var iterate::*result-var*)))
       `(progn
          (with ,result = '())
@@ -760,7 +760,7 @@
 
   "
   ;; TODO: result-type
-  (alexandria:with-gensyms (max value m-value tail)
+  (with-gensyms (max value m-value tail)
     (let ((result (or var iterate::*result-var*)))
       `(progn
          (with ,result = '())
@@ -798,7 +798,7 @@
   (let ((result (or var iterate::*result-var*)))
     (typecase test
       ((cons (eql function) (cons t null))
-       (alexandria:with-gensyms (value)
+       (with-gensyms (value)
          `(progn
             (for ,value = ,expr)
             (when (funcall ,test ,value)