integer encoding/decoding tests

[cl-protobufs.git] / api.lisp

diff --git a/api.lisp b/api.lisp
index c7ce9f2c316701277044606b11b40651b83e65e2..de7fd2707ea5d1c0025974c8803a7ee610f38211 100644 (file)
--- a/api.lisp
+++ b/api.lisp
@@ -1,8 +1,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;                                                                  ;;;
-;;; Confidential and proprietary information of ITA Software, Inc.   ;;;
+;;; Free Software published under an MIT-like license. See LICENSE   ;;;
 ;;;                                                                  ;;;
-;;; Copyright (c) 2012 ITA Software, Inc.  All rights reserved.      ;;;
+;;; Copyright (c) 2012 Google, Inc.  All rights reserved.            ;;;
 ;;;                                                                  ;;;
 ;;; Original author: Scott McKay                                     ;;;
 ;;;                                                                  ;;;
@@ -110,28 +110,30 @@
 
 (defmethod reinitialize-object (object (message protobuf-message))
   (dolist (field (proto-fields message))
-    (reinitialize-field object field message))
+    (reinitialize-field object message field))
   object)
 
-(defmethod reinitialize-field (object field (message protobuf-message))
-  (macrolet ((write-slot (object slot writer value)
-               `(if ,writer
-                  (funcall ,writer ,object ,value)
-                  (setf (slot-value ,object ,slot) ,value))))
-    (let ((default (proto-default field))
-          (slot    (proto-value field))
-          (writer  (proto-writer field)))
-      (cond ((null slot)
-             (unless (empty-default-p field)
-               (write-slot object slot writer default)))
-            (t
-             (if (empty-default-p field)
-               (slot-makunbound object slot)
-               (write-slot object slot writer default)))))))
-
-(defmethod reinitialize-slot (object slot (message protobuf-message))
-  (let ((field (find slot (proto-fields message) :key #'proto-value)))
-    (reinitialize-field object field message)))
+(defgeneric reinitialize-field (object message field)
+  (:method (object (message protobuf-message) field)
+    (macrolet ((write-slot (object slot writer value)
+                 `(if ,writer
+                    (funcall ,writer ,object ,value)
+                    (setf (slot-value ,object ,slot) ,value))))
+      (let ((default (proto-default field))
+            (slot    (proto-value field))
+            (writer  (proto-writer field)))
+        (cond ((null slot)
+               (unless (empty-default-p field)
+                 (write-slot object slot writer default)))
+              (t
+               (if (empty-default-p field)
+                 (slot-makunbound object slot)
+                 (write-slot object slot writer default))))))))
+
+(defgeneric reinitialize-slot (object message slot)
+  (:method (object (message protobuf-message) slot)
+    (let ((field (find slot (proto-fields message) :key #'proto-value)))
+      (reinitialize-field object message field))))
 
 \f
 ;;; A Python-like, Protobufs2-compatible API
@@ -195,7 +197,8 @@
   (:documentation
    "Serialize 'object' into 'buffer' using the wire format, starting at the index
    'start' and going no farther than 'end'. 'object' is an object whose Lisp class
-   corresponds to a Protobufs message.")
+   corresponds to a Protobufs message.
+   Returns two values, the final index and the buffer.")
   (:method ((object standard-object) &optional buffer (start 0) end)
     (declare (ignore end))
     (let* ((class   (type-of object))
@@ -209,8 +212,10 @@
              (buffer  (or buffer (make-byte-vector size))))
         (assert (>= (length buffer) size) ()
                 "The buffer ~S is not large enough to hold ~S" buffer object)
-        (serialize-object object type buffer start visited)
-        buffer))))
+        (multiple-value-bind (nbuf nend)
+            (serialize-object object type buffer start visited)
+        (declare (ignore nbuf))
+        (values nend buffer))))))
 
 (defgeneric merge-from-array (object buffer &optional start end)
   (:documentation
@@ -244,6 +249,6 @@
               "There is no Protobufs message for the class ~S" class)
       (assert (eq class (type-of source)) ()
               "The objects ~S and ~S are of not of the same class" object source)
-      ;;--- Do this
+      ;;--- Do this (should return side-effected 'object', not 'source')
       type
-      object)))
+      source)))