Today's wip.

[sod] / src / pset-proto.lisp

diff --git a/src/pset-proto.lisp b/src/pset-proto.lisp
index 91668ed..e98c908 100644 (file)
--- a/src/pset-proto.lisp
+++ b/src/pset-proto.lisp
@@ -70,7 +70,8 @@
   (:method ((raw string)) (values :string raw))
   (:method ((raw character)) (values :char raw))
   (:method ((raw property)) (values (p-type raw) (p-value raw)))
-  (:method ((raw cons)) (values (car raw) (cdr raw))))
+  (:method ((raw cons)) (values (car raw) (cdr raw)))
+  (:method ((raw function)) (values :func raw)))
 
 (export 'make-property)
 (defun make-property (name raw-value &key type location seenp)
@@ -224,7 +225,10 @@
    Otherwise the value is coerced to the right kind of thing (where possible)
    and returned.
 
-   If PSET is nil, then return DEFAULT."
+   The file location at which the property was defined is returned as a
+   second value.
+
+   If PSET is nil, then return DEFAULT and nil."
 
   (let ((prop (and pset (pset-get pset (property-key name)))))
     (with-default-error-location ((and prop (p-location prop)))