From 9435aa8bc451ef73fb1414d4eab03a501b08fb87 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 21 Oct 2010 21:14:28 +0000
Subject: [PATCH] *Core: Fixed ValueArray / ValueMap serialization

git-svn-id: svn://ultimatepp.org/upp/trunk@2806 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Value.cpp | 24 ++++++++++++++++++++++--
 uppsrc/Core/Value.h   |  4 ++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp
index c61821098..7b50e79b1 100644
--- a/uppsrc/Core/Value.cpp
+++ b/uppsrc/Core/Value.cpp
@@ -127,6 +127,20 @@ VectorMap<dword, Value::Void *(*)(Stream& s)>& Value::Typemap()
 	return x;
 }
 
+Value::Void *ValueArrayDataCreate(Stream& s)
+{
+	ValueArray::Data *a = new ValueArray::Data;
+	a->Serialize(s);
+	return a;
+}
+
+Value::Void *ValueMapDataCreate(Stream& s)
+{
+	ValueMap::Data *a = new ValueMap::Data;
+	a->Serialize(s);
+	return a;
+}
+
 static void sRegisterStd()
 {
 	ONCELOCK {
@@ -138,8 +152,8 @@ static void sRegisterStd()
 		RichValue<WString>::Register();
 		RichValue<Date>::Register();
 		RichValue<Time>::Register();
-		RichValue<ValueArray>::Register();
-		RichValue<ValueMap>::Register();		
+		Value::Register(VALUEARRAY_V, ValueArrayDataCreate);
+		Value::Register(VALUEMAP_V, ValueMapDataCreate);
 	};
 }
 
@@ -308,6 +322,7 @@ Vector<Value>& ValueArray::Clone() {
 
 ValueArray::ValueArray() {
 	data = &Single<NullData>();
+	DDUMPC(data->data);
 	data->Retain();
 }
 
@@ -478,6 +493,7 @@ void ValueMap::Init0()
 {
 	data = &Single<NullData>();
 	data->Retain();
+	DDUMP(data->value);
 }
 
 ValueMap::ValueMap(const ValueMap& v)
@@ -538,12 +554,16 @@ void ValueMap::Clear() {
 
 void ValueMap::Add(const Value& key, const Value& value) {
 	Data& d = Clone();
+	DDUMP(key);
+	DDUMP(value);
 	d.key.Add(key);
 	d.value.Add(value);
+	DDUMP(d.value);
 }
 
 Value ValueMap::operator[](const Value& key) const
 {
+	DDUMP(data->value);
 	int q = data->key.Find(key);
 	return q >= 0 ? data->value[q] : ErrorValue();
 }
diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h
index 75eea064a..ca7335474 100644
--- a/uppsrc/Core/Value.h
+++ b/uppsrc/Core/Value.h
@@ -616,6 +616,8 @@ class ValueArray : AssignValueTypeNo<ValueArray, VALUEARRAY_V, Moveable<ValueArr
 
 	Vector<Value>& Create();
 	Vector<Value>& Clone();
+	
+	friend Value::Void *ValueArrayDataCreate(Stream& s);
 
 public:
 	ValueArray();
@@ -681,6 +683,8 @@ class ValueMap : AssignValueTypeNo<ValueMap, VALUEMAP_V, Moveable<ValueMap> >{
 	Data& Clone();
 	void  Init0();
 
+	friend Value::Void *ValueMapDataCreate(Stream& s);
+
 public:
 	ValueMap()                               { Init0(); }
 	ValueMap(const ValueMap& v);