diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-02-29 17:43:35 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-02-29 17:43:35 +0100 |
| commit | 14f48f39fd127819c658aec816a07a63a0d54e15 (patch) | |
| tree | 71b05eb19b5d2c372f95aa7a21790568c944f269 /compiler | |
| parent | b893e0dbf5b13c157f827e71147fc8ba052e4746 (diff) | |
| parent | 1b4fc744dba1f3e83c543f1d8382c9215117c170 (diff) | |
| download | Nim-14f48f39fd127819c658aec816a07a63a0d54e15.tar.gz | |
Merge pull request #3917 from yglukhov/json-fix
Fixed bad JS codegen for new json with tables. Added json to JS tests.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jsgen.nim | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index fc27a3ec0..d6b546d8b 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -891,10 +891,12 @@ proc genFieldAccess(p: PProc, n: PNode, r: var TCompRes) = r.res = "$1['$2']" % [r.res, f.loc.r] r.kind = resExpr +proc genAddr(p: PProc, n: PNode, r: var TCompRes) + proc genCheckedFieldAddr(p: PProc, n: PNode, r: var TCompRes) = let m = if n.kind == nkHiddenAddr: n.sons[0] else: n internalAssert m.kind == nkCheckedFieldExpr - genFieldAddr(p, m.sons[0], r) # XXX + genAddr(p, m, r) # XXX proc genCheckedFieldAccess(p: PProc, n: PNode, r: var TCompRes) = genFieldAccess(p, n.sons[0], r) # XXX |