Implement serialization of KnowHOWREPR.

jnthn · Mar 9, 2013 · 975f9b0 · 975f9b0
1 parent b3747d7
commit 975f9b0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/src/org/perl6/nqp/sixmodel/SerializationWriter.java b/src/org/perl6/nqp/sixmodel/SerializationWriter.java
@@ -4,6 +4,8 @@
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.perl6.nqp.runtime.*;
 import org.perl6.nqp.sixmodel.reprs.*;
@@ -197,6 +199,24 @@ public void writeObjRef(SixModelObject ref) {
 	    outputs[currentBuffer].putInt(ref.sc.root_objects.indexOf(ref));
 	}
 
+	public void writeList(List<SixModelObject> list) {
+		growToHold(currentBuffer, 6);
+		outputs[currentBuffer].putShort(REFVAR_VM_ARR_VAR);
+		outputs[currentBuffer].putInt(list.size());
+    	for (SixModelObject item : list)
+    		writeRef(item);
+	}
+
+	public void writeHash(Map<String, SixModelObject> hash) {
+		growToHold(currentBuffer, 6);
+		outputs[currentBuffer].putShort(REFVAR_VM_HASH_STR_VAR);
+		outputs[currentBuffer].putInt(hash.size());
+    	for (String key : hash.keySet()) {
+    		writeStr(key);
+    		writeRef(hash.get(key));
+    	}
+	}
+
 	/* Writing function for references to things. */
 	public void writeRef(SixModelObject ref) {
 	    /* Work out what kind of thing we have and determine the discriminator. */
@@ -459,12 +479,7 @@ private void serializeStable(STable st) {
 	    /* Method cache and v-table. */
 	    growToHold(currentBuffer, 2);
 	    if (st.MethodCache != null) {
-	    	outputs[currentBuffer].putShort(REFVAR_VM_HASH_STR_VAR);
-	    	writeInt32(st.MethodCache.size());
-	    	for (String meth : st.MethodCache.keySet()) {
-	    		writeStr(meth);
-	    		writeRef(st.MethodCache.get(meth));
-	    	}
+	    	writeHash(st.MethodCache);
 	    }
 	    else {
 	    	outputs[currentBuffer].putShort(REFVAR_VM_NULL);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/KnowHOWREPR.java b/src/org/perl6/nqp/sixmodel/reprs/KnowHOWREPR.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 
+import org.perl6.nqp.runtime.ExceptionHandling;
 import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.*;
 
@@ -39,4 +40,11 @@ public void deserialize_finish(ThreadContext tc, STable st,
 
 	    body.methods = ((VMHashInstance)reader.readRef()).storage;
 	}
+
+    public void serialize(ThreadContext tc, SerializationWriter writer, SixModelObject obj) {
+    	KnowHOWREPRInstance kh = (KnowHOWREPRInstance)obj;
+    	writer.writeStr(kh.name);
+    	writer.writeList(kh.attributes);
+    	writer.writeHash(kh.methods);
+    }
 }