Merge branch 'type-expansion' into portability

diff --git a/cl-protobufs.asd b/cl-protobufs.asd
index 97b846b7f672e442c09beb7560fd3251b85290fc..7aaf3bf305508eba05b7da0776cb87eae185976d 100644 (file)
--- a/cl-protobufs.asd
+++ b/cl-protobufs.asd
@@ -19,7 +19,7 @@
   :maintainer '("Scott McKay")
   :description      "Protobufs for Common Lisp"
   :long-description "Protobufs for Common Lisp"
-  :depends-on (:closer-mop :babel)
+  :depends-on (:closer-mop :babel :trivial-garbage)
   :serial t
   :components
     ((:module "packages"

diff --git a/define-proto.lisp b/define-proto.lisp
index 9f6cca4055839cab758df66ff4c1c154c82d1648..163cd8e6e66312b74aaeae4d254423c1bd8183b1 100644 (file)
--- a/define-proto.lisp
+++ b/define-proto.lisp
@@ -408,8 +408,7 @@
                                      (intern (format nil "~A-~A" 'set reader) *protobuf-package*)))
                          (default (getf inits :initform)))
                     (collect-form `(without-redefinition-warnings ()
-                                     (let ((,stable #+ccl  (make-hash-table :test #'eq :weak t)
-                                                    #+sbcl (make-hash-table :test #'eq :weakness :value)))
+                                     (let ((,stable (tg:make-weak-hash-table :weakness :value :test #'eq)))
                                        ,@(and reader `((defmethod ,reader ((object ,type))
                                                          (gethash object ,stable ,default))))
                                        ,@(and writer `((defmethod ,writer ((object ,type) value)
@@ -463,8 +462,7 @@
                  ;; will result in harmless redefinitions, so squelch the warnings
                  ;;--- Maybe these methods need to be defined in 'define-message'?
                  (collect-form `(without-redefinition-warnings ()
-                                  (let ((,stable #+ccl  (make-hash-table :test #'eq :weak t)
-                                                 #+sbcl (make-hash-table :test #'eq :weakness :value)))
+                                  (let ((,stable (tg:make-weak-hash-table :weakness :value :test #'eq)))
                                     ,@(and reader `((defmethod ,reader ((object ,type))
                                                       (gethash object ,stable ,default))))
                                     ,@(and writer `((defmethod ,writer ((object ,type) value)
@@ -796,7 +794,8 @@
               ;; response as an application object.
               (collect-form `(defgeneric ,client-fn (,vchannel ,vrequest &key ,vcallback)
                                ,@(and documentation `((:documentation ,documentation)))
-                               #-sbcl (declare (values ,output-type))
+                               #+(or ccl)
+                               (declare (values ,output-type))
                                (:method (,vchannel (,vrequest ,input-type) &key ,vcallback)
                                  (declare (ignorable ,vchannel ,vcallback))
                                  (let ((call (and *rpc-package* *rpc-call-function*)))
@@ -817,7 +816,8 @@
               ;; The RPC code provides the channel classes and does (de)serialization, etc
               (collect-form `(defgeneric ,server-fn (,vchannel ,vrequest)
                                ,@(and documentation `((:documentation ,documentation)))
-                               #-sbcl (declare (values ,output-type))))))))
+                               #+(or ccl)
+                               (declare (values ,output-type))))))))
       `(progn
          define-service
          ,service