diff options
author | flywind <xzsflywind@gmail.com> | 2021-03-05 14:41:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 22:41:20 -0800 |
commit | cda443ee680d7a8347f00486a5aa860001fcd6de (patch) | |
tree | 3ec485f7330327f6067038ea0770931895818a60 /lib | |
parent | f28dc2c61ed2ee4452441c1a5508cb1e46a8f288 (diff) | |
download | Nim-cda443ee680d7a8347f00486a5aa860001fcd6de.tar.gz |
follow up #17165 (#17262)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pure/json.nim | 5 | ||||
-rw-r--r-- | lib/std/private/jsutils.nim | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim index 1d2b20176..b556f7ccf 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -908,14 +908,13 @@ proc parseJson*(s: Stream, filename: string = ""; rawIntegers = false, rawFloats when defined(js): from std/math import `mod` - import std/jsffi + from std/jsffi import JSObject, `[]`, to + from std/private/jsutils import getProtoName proc parseNativeJson(x: cstring): JSObject {.importjs: "JSON.parse(#)".} proc getVarType(x: JSObject): JsonNodeKind = result = JNull - proc getProtoName(y: JSObject): cstring - {.importjs: "Object.prototype.toString.call(#)".} case $getProtoName(x) # TODO: Implicit returns fail here. of "[object Array]": return JArray of "[object Object]": return JObject diff --git a/lib/std/private/jsutils.nim b/lib/std/private/jsutils.nim index 14104261e..b858e150e 100644 --- a/lib/std/private/jsutils.nim +++ b/lib/std/private/jsutils.nim @@ -36,3 +36,4 @@ when defined(js): proc hasBigUint64Array*(): bool = asm """`result` = typeof BigUint64Array != 'undefined'""" + proc getProtoName*[T](a: T): cstring {.importjs: "Object.prototype.toString.call(#)".} |