diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-03-01 23:25:58 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-03-01 23:25:58 +0100 |
| commit | 180a4b7657260af5411a4bea58240d3cac2ea0fe (patch) | |
| tree | e11f7cafa2c9d4c684cc7cbbe7171b68fc746a5f /compiler | |
| parent | 06d4131ce1bb236f0d5a14efdfb12e825c5fee0f (diff) | |
| parent | a4779dba7599618e65ac7059077d4e979fb6db9e (diff) | |
| download | Nim-180a4b7657260af5411a4bea58240d3cac2ea0fe.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ccgstmts.nim | 6 | ||||
| -rw-r--r-- | compiler/jsgen.nim | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim index 529e59273..f2ceadcce 100644 --- a/compiler/ccgstmts.nim +++ b/compiler/ccgstmts.nim @@ -928,8 +928,10 @@ proc genTry(p: BProc, t: PNode, d: var TLoc) = for j in countup(0, blen - 2): assert(t.sons[i].sons[j].kind == nkType) if orExpr != nil: add(orExpr, "||") - appcg(p.module, orExpr, - "#isObj(#getCurrentException()->Sup.m_type, $1)", + let isObjFormat = if not p.module.compileToCpp: + "#isObj(#getCurrentException()->Sup.m_type, $1)" + else: "#isObj(#getCurrentException()->m_type, $1)" + appcg(p.module, orExpr, isObjFormat, [genTypeInfo(p.module, t.sons[i].sons[j].typ)]) if i > 1: line(p, cpsStmts, "else ") startBlock(p, "if ($1) {$n", [orExpr]) 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 |