mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-03 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3273 from yglukhov/js-copy-fix

Browse Source 
Fixed JS copying.
This commit is contained in:
Andreas Rumpf
2015-09-03 14:22:10 +02:00
parent c3d399ed70 02214d8d1b
commit 580855d2eb
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/system/jssys.nim
View File

@@ -547,18 +547,14 @@ proc nimCopyAux(dest, src: JSRef, n: ptr TNimNode) {.compilerproc.} =
of nkNone: sysAssert(false, "nimCopyAux")
of nkSlot:
asm """
var ddest = `dest`[`n`.offset];
if (ddest === undefined) ddest = null;
`dest`[`n`.offset] = nimCopy(ddest, `src`[`n`.offset], `n`.typ);
`dest`[`n`.offset] = nimCopy(`dest`[`n`.offset], `src`[`n`.offset], `n`.typ);
"""
of nkList:
for i in 0..n.len-1:
nimCopyAux(dest, src, n.sons[i])
of nkCase:
asm """
var ddest = `dest`[`n`.offset];
if (ddest === undefined) ddest = null;
`dest`[`n`.offset] = nimCopy(ddest, `src`[`n`.offset], `n`.typ);
`dest`[`n`.offset] = nimCopy(`dest`[`n`.offset], `src`[`n`.offset], `n`.typ);
for (var i = 0; i < `n`.sons.length; ++i) {
nimCopyAux(`dest`, `src`, `n`.sons[i][1]);
}
@@ -579,13 +575,13 @@ proc nimCopy(dest, src: JSRef, ti: PNimType): JSRef =
of tyTuple, tyObject:
if ti.base != nil: result = nimCopy(dest, src, ti.base)
elif ti.kind == tyObject:
asm "`result` = (`dest` === null) ? {m_type: `ti`} : `dest`;"
asm "`result` = (`dest` === null || `dest` === undefined) ? {m_type: `ti`} : `dest`;"
else:
asm "`result` = (`dest` === null) ? {} : `dest`;"
asm "`result` = (`dest` === null || `dest` === undefined) ? {} : `dest`;"
nimCopyAux(result, src, ti.node)
of tySequence, tyArrayConstr, tyOpenArray, tyArray:
asm """
if (`dest` === null) {
if (`dest` === null || `dest` === undefined) {
`dest` = new Array(`src`.length);
}
else {