From e42a6889a2966d8e9fd4e6b2b1bb3dd28c9794c9 Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 20 Jun 2012 11:58:40 -0400
Subject: 1. handle pmt serialize and deserialize for tuples 2. fix offset
 checking in pmt_annotator_raw

---
 gruel/src/lib/pmt/pmt-serial-tags.scm |  1 +
 gruel/src/lib/pmt/pmt_serialize.cc    | 41 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

(limited to 'gruel/src/lib/pmt')

diff --git a/gruel/src/lib/pmt/pmt-serial-tags.scm b/gruel/src/lib/pmt/pmt-serial-tags.scm
index a78d87681..4f06bf75f 100644
--- a/gruel/src/lib/pmt/pmt-serial-tags.scm
+++ b/gruel/src/lib/pmt/pmt-serial-tags.scm
@@ -34,6 +34,7 @@
 
 (define pst-uniform-vector	#x0a)
 (define pst-uint64	#x0b)
+(define pst-tuple	#x0c)
 
 ;; u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, c32, c64
 ;;
diff --git a/gruel/src/lib/pmt/pmt_serialize.cc b/gruel/src/lib/pmt/pmt_serialize.cc
index 05140bb42..8c9dd12b3 100644
--- a/gruel/src/lib/pmt/pmt_serialize.cc
+++ b/gruel/src/lib/pmt/pmt_serialize.cc
@@ -24,6 +24,7 @@
 #endif
 #include <vector>
 #include <gruel/pmt.h>
+#include <iostream>
 #include "pmt_int.h"
 #include "gruel/pmt_serial_tags.h"
 
@@ -213,6 +214,28 @@ deserialize_untagged_f64(double *ip, std::streambuf &sb)
   return t != std::streambuf::traits_type::eof();
 }
 
+static bool
+deserialize_tuple(pmt_t *tuple, std::streambuf &sb)
+{
+    std::cout << "deserialize_tuple\n";
+    uint32_t nitems;
+    bool ok = deserialize_untagged_u32(&nitems, sb);
+    pmt_t list(PMT_NIL);
+    std::cout << "nitems: " << nitems << "\n";
+    for(uint32_t i=0; i<nitems; i++){   
+        std::cout << "deserialize_tuple :: recursive call to pmt_deserialize\n";
+        pmt_t item = pmt_deserialize( sb );
+        pmt_print(item);
+        if(pmt_eq(list, PMT_NIL)){
+            list = pmt_list1(item);
+        } else {
+            list = pmt_list_add(list, item);
+        }
+    }
+    (*tuple) = pmt_to_tuple(list);
+    return ok;
+}
+
 
 /*
  * Write portable byte-serial representation of \p obj to \p sb
@@ -300,6 +323,16 @@ pmt_serialize(pmt_t obj, std::streambuf &sb)
   if (pmt_is_dict(obj))
     throw pmt_notimplemented("pmt_serialize (dict)", obj);
 
+  if (pmt_is_tuple(obj)){
+    size_t tuple_len = pmt::pmt_length(obj);
+    ok = serialize_untagged_u8(PST_COMPLEX, sb);
+    ok &= serialize_untagged_u32(tuple_len, sb);
+    for(size_t i=0; i<tuple_len; i++){
+        ok &= pmt_serialize(pmt_tuple_ref(obj, i), sb);
+    }
+    return ok;
+  }
+  //throw pmt_notimplemented("pmt_serialize (tuple)", obj);
 
   throw pmt_notimplemented("pmt_serialize (?)", obj);
 }
@@ -369,6 +402,14 @@ pmt_deserialize(std::streambuf &sb)
       goto error;
     return pmt_make_rectangular( r,i );
     }
+    
+  case PST_TUPLE:
+    {
+    pmt_t tuple;
+    if(!deserialize_tuple(&tuple, sb));
+      goto error;
+    return tuple;
+    }
 
   case PST_VECTOR:
   case PST_DICT:
-- 
cgit 


From 7e24c8d52a04e92d755a44ab56e28b63eeb86ea0 Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 20 Jun 2012 12:24:54 -0400
Subject: bug fixxes to tuple serialize

---
 gruel/src/lib/pmt/pmt_serialize.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'gruel/src/lib/pmt')

diff --git a/gruel/src/lib/pmt/pmt_serialize.cc b/gruel/src/lib/pmt/pmt_serialize.cc
index 8c9dd12b3..3c62b01f6 100644
--- a/gruel/src/lib/pmt/pmt_serialize.cc
+++ b/gruel/src/lib/pmt/pmt_serialize.cc
@@ -24,7 +24,6 @@
 #endif
 #include <vector>
 #include <gruel/pmt.h>
-#include <iostream>
 #include "pmt_int.h"
 #include "gruel/pmt_serial_tags.h"
 
@@ -217,13 +216,10 @@ deserialize_untagged_f64(double *ip, std::streambuf &sb)
 static bool
 deserialize_tuple(pmt_t *tuple, std::streambuf &sb)
 {
-    std::cout << "deserialize_tuple\n";
     uint32_t nitems;
     bool ok = deserialize_untagged_u32(&nitems, sb);
     pmt_t list(PMT_NIL);
-    std::cout << "nitems: " << nitems << "\n";
     for(uint32_t i=0; i<nitems; i++){   
-        std::cout << "deserialize_tuple :: recursive call to pmt_deserialize\n";
         pmt_t item = pmt_deserialize( sb );
         pmt_print(item);
         if(pmt_eq(list, PMT_NIL)){
@@ -325,7 +321,7 @@ pmt_serialize(pmt_t obj, std::streambuf &sb)
 
   if (pmt_is_tuple(obj)){
     size_t tuple_len = pmt::pmt_length(obj);
-    ok = serialize_untagged_u8(PST_COMPLEX, sb);
+    ok = serialize_untagged_u8(PST_TUPLE, sb);
     ok &= serialize_untagged_u32(tuple_len, sb);
     for(size_t i=0; i<tuple_len; i++){
         ok &= pmt_serialize(pmt_tuple_ref(obj, i), sb);
@@ -406,8 +402,9 @@ pmt_deserialize(std::streambuf &sb)
   case PST_TUPLE:
     {
     pmt_t tuple;
-    if(!deserialize_tuple(&tuple, sb));
+    if(!deserialize_tuple(&tuple, sb)){
       goto error;
+    }
     return tuple;
     }
 
-- 
cgit