doc/concepts.tex: Fix subclass/superclass confusion.

[sod] / src / pset-impl.lisp

diff --git a/src/pset-impl.lisp b/src/pset-impl.lisp
index 60674ff..338306a 100644 (file)
--- a/src/pset-impl.lisp
+++ b/src/pset-impl.lisp
@@ -74,12 +74,30 @@
                 (error "Symbol `~A' not external in package `~A'"
                        name (package-name package)))))))))
 
+(let ((truish '("true" "t" "yes" "on" "verily"))
+      (falsish '("false" "nil" "no" "off" "nowise")))
+  (defun truishp (string)
+    "Convert STRING to a boolean."
+    (cond ((member string truish :test #'string-equal) t)
+         ((member string falsish :test #'string-equal) nil)
+         (t (error "Unrecognized boolean value `~A'" string)))))
+
 ;;;--------------------------------------------------------------------------
 ;;; Property representation.
 
 (defmethod file-location ((prop property))
   (file-location (p-location prop)))
 
+;;; Input conversions.
+
+(defmethod decode-property ((raw symbol)) (values :symbol raw))
+(defmethod decode-property ((raw integer)) (values :int raw))
+(defmethod decode-property ((raw string)) (values :string raw))
+(defmethod decode-property ((raw character)) (values :char raw))
+(defmethod decode-property ((raw function)) (values :func raw))
+(defmethod decode-property ((raw c-type)) (values :type raw))
+(defmethod decode-property ((raw c-fragment)) (values :c-fragment raw))
+
 ;;; Keywords.
 
 (defmethod coerce-property-value
@@ -114,6 +132,20 @@
     ((value symbol) (type (eql :symbol)) (wanted (eql :id)))
   (frob-identifier (symbol-name value)))
 
+;;; Boolean.
+
+(defmethod coerce-property-value
+    ((value symbol) (type (eql :symbol)) (wanted (eql :boolean)))
+  value)
+
+(defmethod coerce-property-value
+    ((value string) (type (eql :id)) (wanted (eql :boolean)))
+  (truishp value))
+
+(defmethod coerce-property-value
+    ((value integer) (type (eql :int)) (wanted (eql :boolean)))
+  (not (zerop value)))
+
 ;;; Types.
 
 (defmethod coerce-property-value