X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/52a79ab8b310a785f2c2f1a11069f3a5ad53810c..b944e68b291d56a561c8797e138b95f1b1092d0a:/src/module-proto.lisp

diff --git a/src/module-proto.lisp b/src/module-proto.lisp
index acb1926..a79069a 100644
--- a/src/module-proto.lisp
+++ b/src/module-proto.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
@@ -84,7 +84,10 @@ (defmacro define-clear-the-decks (name &body body)
 
    When `clear-the-decks' is called, the BODY will be evaluated as a progn.
    The relative order of `clear-the-decks' operations is unspecified."
-  `(add-clear-the-decks-function ',name (lambda () ,@body)))
+  (multiple-value-bind (docs decls body) (parse-body body)
+    `(add-clear-the-decks-function ',name (lambda ()
+					    ,@docs ,@decls
+					    (block ,name ,@body)))))
 
 (export 'clear-the-decks)
 (defun clear-the-decks ()
@@ -148,7 +151,8 @@ (defgeneric finalize-module (module)
 (export '(module module-name module-pset module-items module-dependencies))
 (defclass module ()
   ((name :initarg :name :type pathname :reader module-name)
-   (pset :initarg :pset :initform (make-pset) :type pset :reader module-pset)
+   (%pset :initarg :pset :initform (make-pset)
+	  :type pset :reader module-pset)
    (items :initarg :items :initform nil :type list :accessor module-items)
    (dependencies :initarg :dependencies :initform nil
 		 :type list :accessor module-dependencies)