r11704: can not use keywords in :subobject functions

diff --git a/classes.lisp b/classes.lisp
index 76ba8d7bfbe194046e749528e28a20664689aa85..cae835ec8253e7cb5b7a37184db6fc888af54f0e 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -122,7 +122,7 @@
    (stt :value-type string :initarg :stt :reader stt)
    (suppress :value-type string :initarg :suppress :reader suppress)
    (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
-   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui :sui sui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui)))
   (:metaclass hyperobject-class)
   (:user-name "String")
   (:default-print-slots sui stt lrl str suppress))
@@ -157,7 +157,7 @@
    (ts :value-type string  :initarg :ts :reader ts)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))
-   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui)))
   (:metaclass hyperobject-class)
   (:user-name "Term")
   (:default-print-slots lui lat ts lrl))

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 6bd0012f9809c2cbb3c32b2dd5293e2dfc0ac05a..93812c7902e5714f24ee2625c76bb366d973e4e0 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -644,7 +644,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                   :paui (ensure-integer paui)
                   :sab sab :rela rela :ptr ptr :hcd hcd :cvf cvf)))
 
-(defun find-usat-ui (cui &key lui sui (srl *current-srl*))
+(defun find-usat-ui (cui &optional lui sui &key (srl *current-srl*))
   (ensure-cui-integer cui)
   (ensure-lui-integer lui)
   (ensure-sui-integer sui)