lib/serialization: serialize all insances of Text as we did with srings

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
nitlang · Feb 12, 2016 · 298a7aa · 298a7aa
1 parent 6c61e20
commit 298a7aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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