Changeset 159

Timestamp:

03/05/08 05:39:54 (17 years ago)

Author:

Magnus Henoch

Message:

Move INVALID-ARGUMENTS condition to getopt.lisp, and use it.

Location:

cl-darcs/trunk

Files:

• cmdline.lisp (modified) (1 diff)
• getopt.lisp (modified) (4 diffs)

cl-darcs/trunk/cmdline.lisp ¶

@@ -27 +27 @@
     "Turn a command symbol into a function symbol."
     (intern (format nil "CMD-~A" command) :darcs)))
-
-(define-condition invalid-arguments (simple-error)
-  ())
 
 (defun handle-command-line (argv)

cl-darcs/trunk/getopt.lisp ¶

@@ -16 +16 @@
 
 (in-package :darcs)
+
+(define-condition invalid-arguments (simple-error)
+  ())
 
 ;; The option struct describes a command line option.
@@ -54 +57 @@
                        (if (option-arg opt)
                            (if (or no-argument (null args))
-                               (error "Option ~A requires an argument." arg)
+                               (error 'invalid-arguments
+                                      :format-control "Option ~A requires an argument."
+                                      :format-arguments (list arg))
                                (pop args))
                            t))
@@ -81 +86 @@
                    (option (find long-option options :key #'option-long :test #'string=)))
               (unless option
-                (error "Unknown long option ~S (none of ~{~S ~})." arg (mapcar #'option-long options)))
+                (error 'invalid-arguments
+                       :format-control "Unknown long option ~S (none of ~{~S ~})."
+                       :format-arguments (list arg (mapcar #'option-long options))))
               (maybe-get-argument arg option)))
 
@@ -94 +101 @@
                           (option (find letter options :key #'option-short)))
                      (unless option
-                       (error "Unknown option ~A." letter))
+                       (error 'invalid-arguments
+                              :format-control "Unknown option ~A."
+                              :format-arguments (list letter)))
                      ;; Only the last short option can have an argument.
                      (maybe-get-argument letter option