More work. Highlights:

[sod] / pset.lisp

diff --git a/pset.lisp b/pset.lisp
index 7652812..9db8c4f 100644 (file)
--- a/pset.lisp
+++ b/pset.lisp
@@ -188,8 +188,8 @@
 (defun store-property
     (pset name value &key (type (property-type value)) location)
   "Store a property in PSET."
-  (%pset-store pset
-              (make-property name value :type type :location location)))
+  (pset-store pset
+             (make-property name value :type type :location location)))
 
 (defun get-property (pset name type &optional default)
   "Fetch a property from a property set.
@@ -206,7 +206,7 @@
 
    If PSET is nil, then return DEFAULT."
 
-  (let ((prop (and pset (%pset-get pset (property-key name)))))
+  (let ((prop (and pset (pset-get pset (property-key name)))))
     (with-default-error-location ((and prop (p-location prop)))
       (cond ((not prop)
             (values default nil))
@@ -245,7 +245,7 @@
    alternative is manufacturing a PROPERTY-VALUE object by hand and stuffing
    into the set."
 
-  (do ((pset (%make-pset))
+  (do ((pset (make-pset))
        (plist plist (cddr plist)))
       ((endp plist) pset)
     (add-property pset (car plist) (cadr plist))))
@@ -254,22 +254,23 @@
   (print-unreadable-object (pset stream :type t)
     (pprint-logical-block (stream nil)
       (let ((firstp t))
-       (%pset-map (lambda (prop)
-                    (cond (firstp (setf firstp nil))
-                          (t (write-char #\space stream)
-                             (pprint-newline :linear stream)))
-                    (format stream "~:@<~S ~@_~S ~@_~S~:>"
-                            (p-name prop) (p-type prop) (p-value prop)))
-                  pset)))))
+       (pset-map (lambda (prop)
+                   (cond (firstp (setf firstp nil))
+                         (t (write-char #\space stream)
+                            (pprint-newline :linear stream)))
+                   (format stream "~:@<~S ~@_~S ~@_~S~:>"
+                           (p-name prop) (p-type prop) (p-value prop)))
+                 pset)))))
 
 (defun check-unused-properties (pset)
   "Issue errors about unused properties in PSET."
-  (%pset-map (lambda (prop)
-              (unless (p-seenp prop)
-                (cerror*-with-location (p-location prop)
-                                       "Unknown property `~A'"
-                                       (p-name prop))))
-            pset))
+  (when pset
+    (pset-map (lambda (prop)
+               (unless (p-seenp prop)
+                 (cerror*-with-location (p-location prop)
+                                        "Unknown property `~A'"
+                                        (p-name prop))))
+             pset)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Expression parser.