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

Fix concat behaviour for uninitialized strings (#8950)

Browse source
This commit is contained in:
LemonBoy 2018-09-11 23:35:21 +02:00 • committed by Andreas Rumpf
commit 87955eaf30
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/jsgen.nim
View file

@ -1660,12 +1660,18 @@ proc genMagic(p: PProc, n: PNode, r: var TCompRes) =
binaryExpr(p, n, r, "addChar", binaryExpr(p, n, r, "addChar",
"if ($1 != null) { addChar($1, $2); } else { $1 = [$2]; }") "if ($1 != null) { addChar($1, $2); } else { $1 = [$2]; }")
of mAppendStrStr: of mAppendStrStr:
var lhs, rhs: TCompRes
gen(p, n[1], lhs)
gen(p, n[2], rhs)
let rhsIsLit = n[2].kind in nkStrKinds
if skipTypes(n.sons[1].typ, abstractVarRange).kind == tyCString: if skipTypes(n.sons[1].typ, abstractVarRange).kind == tyCString:
binaryExpr(p, n, r, "", "if ($1 != null) { $1 += $2; } else { $1 = $2; }") r.res = "if ($1 != null) { $1 += $2; } else { $1 = $2$3; }" % [
lhs.rdLoc, rhs.rdLoc, if rhsIsLit: nil else: ~".slice()"]
else: else:
binaryExpr(p, n, r, "", r.res = "if ($1 != null) { $1 = ($1).concat($2); } else { $1 = $2$3; }" % [
"if ($1 != null) { $1 = ($1).concat($2); } else { $1 = $2;}") lhs.rdLoc, rhs.rdLoc, if rhsIsLit: nil else: ~".slice()"]
# XXX: make a copy of $2, because of Javascript's sucking semantics r.kind = resExpr
of mAppendSeqElem: of mAppendSeqElem:
var x, y: TCompRes var x, y: TCompRes
gen(p, n.sons[1], x) gen(p, n.sons[1], x)
@ -1693,13 +1699,9 @@ proc genMagic(p: PProc, n: PNode, r: var TCompRes) =
of mSizeOf: r.res = rope(getSize(p.config, n.sons[1].typ)) of mSizeOf: r.res = rope(getSize(p.config, n.sons[1].typ))
of mChr, mArrToSeq: gen(p, n.sons[1], r) # nothing to do of mChr, mArrToSeq: gen(p, n.sons[1], r) # nothing to do
of mOrd: genOrd(p, n, r) of mOrd: genOrd(p, n, r)
of mLengthStr: of mLengthStr, mLengthSeq, mLengthOpenArray, mLengthArray:
unaryExpr(p, n, r, "", "($1 != null ? $1.length : 0)") unaryExpr(p, n, r, "", "($1 != null ? $1.length : 0)")
of mXLenStr: of mXLenStr, mXLenSeq:
unaryExpr(p, n, r, "", "$1.length")
of mLengthSeq, mLengthOpenArray, mLengthArray:
unaryExpr(p, n, r, "", "($1 != null ? $1.length : 0)")
of mXLenSeq:
unaryExpr(p, n, r, "", "$1.length") unaryExpr(p, n, r, "", "$1.length")
of mHigh: of mHigh:
unaryExpr(p, n, r, "", "($1 != null ? ($1.length-1) : -1)") unaryExpr(p, n, r, "", "($1 != null ? ($1.length-1) : -1)")

5
tests/js/tstrconcat.nim Normal file
View file

@ -0,0 +1,5 @@
var x: string
var y = "foo"
add(x, y)
y[0] = 'm'
doAssert y == "moo" and x == "foo"