diff options
| author | Araq <rumpf_a@web.de> | 2017-05-09 17:26:54 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2017-05-09 17:26:54 +0200 |
| commit | ae7fd0fcedd5db50142c6d76fc3b9c3e6dfa3ad7 (patch) | |
| tree | 2f2a4de9e6041950cae0b66217660ceee24f07a1 /compiler/jsgen.nim | |
| parent | 79b12faf9ec63d04a7b3a58134e27b4ffb60bcaf (diff) | |
| parent | fa3436fb657141127038d88431b4aad113c27cf6 (diff) | |
| download | Nim-ae7fd0fcedd5db50142c6d76fc3b9c3e6dfa3ad7.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler/jsgen.nim')
| -rw-r--r-- | compiler/jsgen.nim | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index ad988d1b0..eb3fb9f47 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -1864,8 +1864,8 @@ proc genMagic(p: PProc, n: PNode, r: var TCompRes) = proc genSetConstr(p: PProc, n: PNode, r: var TCompRes) = var a, b: TCompRes - useMagic(p, "SetConstr") - r.res = rope("SetConstr(") + useMagic(p, "setConstr") + r.res = rope("setConstr(") r.kind = resExpr for i in countup(0, sonsLen(n) - 1): if i > 0: add(r.res, ", ") @@ -1878,6 +1878,12 @@ proc genSetConstr(p: PProc, n: PNode, r: var TCompRes) = gen(p, it, a) add(r.res, a.res) add(r.res, ")") + # emit better code for constant sets: + if p.target == targetJS and isDeepConstExpr(n): + inc(p.g.unique) + let tmp = rope("ConstSet") & rope(p.g.unique) + addf(p.g.constants, "var $1 = $2;$n", [tmp, r.res]) + r.res = tmp proc genArrayConstr(p: PProc, n: PNode, r: var TCompRes) = var a: TCompRes |