X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/bb80145308ea388d7c6ed5336c061340e78f66e8..5ce911a098f10e0ac2d5917ed09c4c1114abad47:/src/optparse.lisp

diff --git a/src/optparse.lisp b/src/optparse.lisp
index a2ac290..88f5bd7 100644
--- a/src/optparse.lisp
+++ b/src/optparse.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -536,7 +536,7 @@
 	   ,@docs ,@decls
 	   (declare (ignorable ,arg))
 	   (with-locatives ,var
-	     ,@body))
+	     (block ,name ,@body)))
 	 ',name))))
 
 (defun parse-c-integer (string &key radix (start 0) end)
@@ -727,9 +727,12 @@
 
    Option macros should produce a list of expressions producing one option
    structure each."
-  `(progn
-     (setf (get ',name 'optmacro) (lambda ,args ,@body))
-     ',name))
+  (multiple-value-bind (docs decls body) (parse-body body)
+    `(progn
+       (setf (get ',name 'optmacro) (lambda ,args
+				      ,@docs ,@decls
+				      (block ,name ,@body)))
+       ',name)))
 
 (export 'parse-option-form)
 (eval-when (:compile-toplevel :load-toplevel :execute)