From 298a7aaa84dbe584c21f3a26d3d84fdad1a46d62 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Laferri=C3=A8re?= <alexis.laf@xymus.net>
Date: Fri, 12 Feb 2016 14:28:54 -0500
Subject: [PATCH] lib/serialization: serialize all insances of Text as we did
 with srings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---
 lib/binary/serialization.nit        |   14 ++++++--------
 lib/json/serialization.nit          |    6 ++----
 lib/serialization/serialization.nit |    2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/binary/serialization.nit b/lib/binary/serialization.nit
index e069304..a530ebf 100644
--- a/lib/binary/serialization.nit
+++ b/lib/binary/serialization.nit
@@ -336,6 +336,12 @@ redef class Text
 
 		return true
 	end
+
+	redef fun serialize_to_binary(v)
+	do
+		v.stream.write_byte kind_string
+		v.stream.write_block to_s
+	end
 end
 
 # ---
@@ -397,14 +403,6 @@ redef class Char
 	end
 end
 
-redef class String
-	redef fun serialize_to_binary(v)
-	do
-		v.stream.write_byte kind_string
-		v.stream.write_block self
-	end
-end
-
 redef class NativeString
 	redef fun serialize_to_binary(v)
 	do
diff --git a/lib/json/serialization.nit b/lib/json/serialization.nit
index ad44406..9438a0a 100644
--- a/lib/json/serialization.nit
+++ b/lib/json/serialization.nit
@@ -466,6 +466,8 @@ redef class Text
 		end
 		return res
 	end
+
+	redef fun serialize_to_json(v) do v.stream.write(to_json)
 end
 
 redef class Serializable
@@ -534,10 +536,6 @@ redef class Char
 	end
 end
 
-redef class String
-	redef fun serialize_to_json(v) do v.stream.write(to_json)
-end
-
 redef class NativeString
 	redef fun serialize_to_json(v) do to_s.serialize_to_json(v)
 end
diff --git a/lib/serialization/serialization.nit b/lib/serialization/serialization.nit
index 10caaef..cdf1db0 100644
--- a/lib/serialization/serialization.nit
+++ b/lib/serialization/serialization.nit
@@ -221,7 +221,7 @@ redef class Char super DirectSerializable end
 redef class Int super DirectSerializable end
 redef class Float super DirectSerializable end
 redef class NativeString super DirectSerializable end
-redef class String super DirectSerializable end
+redef class Text super DirectSerializable end
 redef class SimpleCollection[E] super Serializable end
 redef class Map[K, V] super Serializable end
 
-- 
1.7.9.5