From bbd69a05dc6362b42e512af7e0efb647fda51467 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 3 Jan 2017 17:26:04 +0300 Subject: [PATCH] KJS: make `JSON` object and allow to pass null to `stringify` methods --- js/js.libraries/src/core/json.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/js/js.libraries/src/core/json.kt b/js/js.libraries/src/core/json.kt index 0cec46403cc..39c436ddd2d 100644 --- a/js/js.libraries/src/core/json.kt +++ b/js/js.libraries/src/core/json.kt @@ -23,17 +23,15 @@ public fun Json.add(other: Json): Json { return this } -public external interface JsonClass { - public fun stringify(o: Any): String - public fun stringify(o: Any, replacer: (key: String, value: Any?) -> Any?): String - public fun stringify(o: Any, replacer: (key: String, value: Any?) -> Any?, space: Int): String - public fun stringify(o: Any, replacer: (key: String, value: Any?) -> Any?, space: String): String - public fun stringify(o: Any, replacer: Array): String - public fun stringify(o: Any, replacer: Array, space: Int): String - public fun stringify(o: Any, replacer: Array, space: String): String +public external object JSON { + public fun stringify(o: Any?): String + public fun stringify(o: Any?, replacer: (key: String, value: Any?) -> Any?): String + public fun stringify(o: Any?, replacer: (key: String, value: Any?) -> Any?, space: Int): String + public fun stringify(o: Any?, replacer: (key: String, value: Any?) -> Any?, space: String): String + public fun stringify(o: Any?, replacer: Array): String + public fun stringify(o: Any?, replacer: Array, space: Int): String + public fun stringify(o: Any?, replacer: Array, space: String): String public fun parse(text: String): T public fun parse(text: String, reviver: ((key: String, value: Any?) -> Any?)): T } - -public external val JSON: JsonClass = noImpl