lib/serialization: serialize all insances of Text as we did with srings
authorAlexis Laferrière <alexis.laf@xymus.net>
Fri, 12 Feb 2016 19:28:54 +0000 (14:28 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Fri, 12 Feb 2016 19:33:02 +0000 (14:33 -0500)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

lib/binary/serialization.nit
lib/json/serialization.nit
lib/serialization/serialization.nit

index e069304..a530ebf 100644 (file)
@@ -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
index ad44406..9438a0a 100644 (file)
@@ -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
index 10caaef..cdf1db0 100644 (file)
@@ -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