optparse.lisp: Move `ignorable' declaration into the right place.

[lisp] / mdw-base.lisp

diff --git a/mdw-base.lisp b/mdw-base.lisp
index 2c1a79c2286cf539e13c48b10ba27b030a59f5f1..df2acd31f2577fb0a336e8fe0456dc7d6bb01ae8 100644 (file)
--- a/mdw-base.lisp
+++ b/mdw-base.lisp
@@ -66,7 +66,7 @@ (defmacro show (x)
   "Debugging tool: print the expression X and its values."
   (let ((tmp (gensym)))
     `(let ((,tmp (multiple-value-list ,x)))
-       (format t "~&")
+       (fresh-line)
        (pprint-logical-block (*standard-output* nil :per-line-prefix ";; ")
         (format t
                 "~S = ~@_~:I~:[#<no values>~;~:*~{~S~^ ~_~}~]"
@@ -135,6 +135,17 @@ (defun whitespace-char-p (ch)
        t)
     (t nil)))
 
+(defmacro defconstant* (name value &key doc test)
+  "Define a constant, like `defconstant'.  The TEST is an equality test used
+   to decide whether to override the current definition, if any."
+  (let ((temp (gensym)))
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
+       (let ((,temp ,value))
+        (unless (and (boundp ',name)
+                     (funcall ,(or test ''eql) (symbol-value ',name) ,temp))
+          (defconstant ,name ,value ,@(and doc (list doc))))
+        ',name))))
+
 (declaim (ftype (function nil ()) slot-unitialized))
 (defun slot-uninitialized ()
   "A function which signals an error.  Can be used as an initializer form in
@@ -184,7 +195,7 @@   (defun fixnump (object)
 (defmacro with-gensyms (syms &body body)
   "Everyone's favourite macro helper."
   `(let (,@(mapcar (lambda (sym) `(,sym (gensym ,(symbol-name sym))))
-                   (listify syms)))
+                  (listify syms)))
      ,@body))
 
 (defmacro let*/gensyms (binds &body body)
@@ -193,16 +204,16 @@ (defmacro let*/gensyms (binds &body body)
    each VAR is bound to a gensym, and in the final expansion, each of those
    gensyms will be bound to the corresponding VALUE."
   (labels ((more (binds)
-             (let ((tmp (gensym "TMP")) (bind (car binds)))
-               `((let ((,tmp ,(cadr bind))
-                       (,(car bind) (gensym ,(symbol-name (car bind)))))
-                   `(let ((,,(car bind) ,,tmp))
-                      ,,@(if (cdr binds)
-                             (more (cdr binds))
-                             body)))))))
+            (let ((tmp (gensym "TMP")) (bind (car binds)))
+              `((let ((,tmp ,(cadr bind))
+                      (,(car bind) (gensym ,(symbol-name (car bind)))))
+                  `(let ((,,(car bind) ,,tmp))
+                     ,,@(if (cdr binds)
+                            (more (cdr binds))
+                            body)))))))
     (if (null binds)
-        `(progn ,@body)
-        (car (more (mapcar #'pairify (listify binds)))))))
+       `(progn ,@body)
+       (car (more (mapcar #'pairify (listify binds)))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Some simple yet useful control structures.
@@ -216,7 +227,7 @@ (defmacro nlet (name binds &body body)
            collect val into vals
            finally (return (values vars vals)))
     `(labels ((,name ,vars
-               ,@body))
+               ,@body))
        (,name ,@vals))))
 
 (defmacro while (cond &body body)
@@ -242,7 +253,7 @@ (compile-time-defun do-case2-like (kind vform clauses)
                               (list `(let ((,(or vary varx) ,argument)
                                            ,@(and vary
                                                   `((,varx ,scrutinee))))
-                                       ,@forms))
+                                       ,@forms))
                               forms))))
                   clauses)))))
 
@@ -307,29 +318,29 @@ (defmacro with-places ((&key environment) places &body body)
   (if (null places)
       `(progn ,@body)
       (let*/gensyms (environment)
-        (labels
-            ((more (places)
-               (let ((place (car places)))
-                 (with-gensyms (tmp valtmps valforms
-                                    newtmps setform getform)
-                   `((let ((,tmp ,(cadr place))
-                           (,(car place)
-                            (gensym ,(symbol-name (car place)))))
-                       (multiple-value-bind
-                           (,valtmps ,valforms
-                            ,newtmps ,setform ,getform)
-                           (get-setf-expansion ,tmp
-                                               ,environment)
-                         (list 'let*
-                               (mapcar #'list ,valtmps ,valforms)
-                               `(symbol-macrolet ((,,(car place)
-                                                   (%place-ref ,,getform
-                                                               ,,setform
-                                                               ,,newtmps)))
-                                  ,,@(if (cdr places)
-                                         (more (cdr places))
-                                         body))))))))))
-          (car (more (mapcar #'pairify (listify places))))))))
+       (labels
+           ((more (places)
+              (let ((place (car places)))
+                (with-gensyms (tmp valtmps valforms
+                                   newtmps setform getform)
+                  `((let ((,tmp ,(cadr place))
+                          (,(car place)
+                           (gensym ,(symbol-name (car place)))))
+                      (multiple-value-bind
+                          (,valtmps ,valforms
+                           ,newtmps ,setform ,getform)
+                          (get-setf-expansion ,tmp
+                                              ,environment)
+                        (list 'let*
+                              (mapcar #'list ,valtmps ,valforms)
+                              `(symbol-macrolet ((,,(car place)
+                                                  (%place-ref ,,getform
+                                                              ,,setform
+                                                              ,,newtmps)))
+                                 ,,@(if (cdr places)
+                                        (more (cdr places))
+                                        body))))))))))
+         (car (more (mapcar #'pairify (listify places))))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Update-in-place macros built using with-places.
@@ -374,7 +385,7 @@ (defmacro locf (place &environment env)
       (get-setf-expansion place env)
     `(let* (,@(mapcar #'list valtmps valforms))
        (make-loc (lambda () ,getform)
-                 (lambda (,@newtmps) ,setform)))))
+                (lambda (,@newtmps) ,setform)))))
 
 (declaim (inline loc (setf loc)))