From a557b68e45b9e065312acfda5061605d7f28b799 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 25 Apr 2016 10:36:09 -0400 Subject: [PATCH] lib/json: remove public dependency from serialization to static MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/json/serialization.nit | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/json/serialization.nit b/lib/json/serialization.nit index 4d00782..8ae1678 100644 --- a/lib/json/serialization.nit +++ b/lib/json/serialization.nit @@ -90,7 +90,7 @@ module serialization import ::serialization::caching private import ::serialization::engine_tools -import static +private import static # Serializer of Nit objects to Json string. class JsonSerializer @@ -220,10 +220,10 @@ class JsonDeserializer private var text: Text # Root json object parsed from input text. - private var root: nullable Jsonable is noinit + private var root: nullable Object is noinit # Depth-first path in the serialized object tree. - private var path = new Array[JsonObject] + private var path = new Array[Map[String, nullable Object]] # Last encountered object reference id. # @@ -232,7 +232,7 @@ class JsonDeserializer init do var root = text.parse_json - if root isa JsonObject then path.add(root) + if root isa Map[String, nullable Object] then path.add(root) self.root = root end @@ -268,7 +268,7 @@ class JsonDeserializer return null end - if object isa JsonObject then + if object isa Map[String, nullable Object] then var kind = null if object.keys.has("__kind") then kind = object["__kind"] @@ -467,7 +467,7 @@ class JsonDeserializer # deserialized = deserializer.deserialize # assert deserialized isa MyError # ~~~ - protected fun class_name_heuristic(json_object: JsonObject): nullable String + protected fun class_name_heuristic(json_object: Map[String, nullable Object]): nullable String do return null end -- 1.7.9.5