safely, optparse: Rename packages.

[lisp] / optparse.lisp

diff --git a/optparse.lisp b/optparse.lisp
index 7819b70..53bc41e 100644 (file)
--- a/optparse.lisp
+++ b/optparse.lisp
@@ -23,7 +23,10 @@
 ;;; along with this program; if not, write to the Free Software Foundation,
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-(defpackage #:mdw.optparse
+;;;--------------------------------------------------------------------------
+;;; Packages.
+
+(defpackage #:optparse
   (:use #:common-lisp #:mdw.base #:mdw.sys-base #:mdw.str)
   (:export #:exit #:*program-name* #:*command-line-strings*
           #:moan #:die
@@ -43,8 +46,9 @@
           #:simple-usage #:show-usage #:show-version #:show-help
           #:sanity-check-option-list))
 
-(in-package #:mdw.optparse)
+(in-package #:optparse)
 
+;;;--------------------------------------------------------------------------
 ;;; Standard error-reporting functions.
 
 (defun moan (msg &rest args)
@@ -55,6 +59,7 @@
   (apply #'moan args)
   (exit 1))
 
+;;;--------------------------------------------------------------------------
 ;;; The main option parser.
 
 (defstruct (option (:predicate optionp)
@@ -411,6 +416,7 @@ completed successfully, or nil if errors occurred."
        (error (,cond)
         (die "~A" ,cond)))))
 
+;;;--------------------------------------------------------------------------
 ;;; Standard option handlers.
 
 (defmacro defopthandler (name (var &optional (arg (gensym)))
@@ -663,6 +669,7 @@ items.  Acceptable items are interpreted as follows:
                         (parse-option-form form)))
                   optlist)))
 
+;;;--------------------------------------------------------------------------
 ;;; Support stuff for help and usage messages
 
 (defun print-text (string