src/optparse.lisp: Cope with options which don't have long names.

This makes the format strings remarkably hairy, but that just adds to
the fun, right?

diff --git a/src/optparse.lisp b/src/optparse.lisp
index c901a9ec021df9ca42e7cadd6dfd503a4be6f4c0..5017fe4daaa769f26a34d1c6fc8eceb59469af08 100644 (file)
--- a/src/optparse.lisp
+++ b/src/optparse.lisp
@@ -997,7 +997,8 @@ (defun show-options-help (opts &optional (stream *standard-output*))
     (dolist (o opts)
       (let ((doc (opt-documentation o)))
        (cond ((not o))
     (dolist (o opts)
       (let ((doc (opt-documentation o)))
        (cond ((not o))

-             ((not (opt-long-name o))
+             ((not (or (opt-short-name o)
+                       (opt-long-name o)))

               (when newlinep
                 (terpri stream)
                 (setf newlinep nil))
               (when newlinep
                 (terpri stream)
                 (setf newlinep nil))


@@ -1007,12 +1008,14 @@ (defun show-options-help (opts &optional (stream *standard-output*))
              (doc
               (setf newlinep t)
               (pprint-logical-block (stream nil :prefix "  ")
              (doc
               (setf newlinep t)
               (pprint-logical-block (stream nil :prefix "  ")

-                (format stream "~:[   ~;-~:*~C,~] --~A"
+                (format stream "~:[   ~;-~:*~C~:[~;,~]~:*~]~@[ --~A~]"

                         (opt-short-name o)
                         (opt-long-name o))
                 (when (opt-arg-name o)
                         (opt-short-name o)
                         (opt-long-name o))
                 (when (opt-arg-name o)

-                  (format stream "~:[=~A~;[=~A]~]"
+                  (format stream
+                          "~:[~;[~]~:[~0@*~:[ ~;~]~*~;=~]~A~0@*~:[~;]~]"

                           (opt-arg-optional-p o)
                           (opt-arg-optional-p o)

+                          (opt-long-name o)

                           (opt-arg-name o)))
                 (write-string "  " stream)
                 (pprint-tab :line 30 1 stream)
                           (opt-arg-name o)))
                 (write-string "  " stream)
                 (pprint-tab :line 30 1 stream)