jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:nim-lang/Nim into devel

Browse source
This commit is contained in:
Araq 2016-08-27 21:12:24 +02:00
commit 686ab6a0d2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/json.nim
View file

@ -1201,19 +1201,19 @@ else:
proc len(x: JSObject): int =
assert x.getVarType == JArray
asm """
return `x`.length;
`result` = `x`.length;
"""
proc `[]`(x: JSObject, y: string): JSObject =
assert x.getVarType == JObject
asm """
return `x`[`y`];
`result` = `x`[`y`];
"""
proc `[]`(x: JSObject, y: int): JSObject =
assert x.getVarType == JArray
asm """
return `x`[`y`];
`result` = `x`[`y`];
"""
proc convertObject(x: JSObject): JsonNode =