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

Fix negative indexed arrays for JS, refs #13966 (#14152)

Browse source 
* Fix negative arrays for JS, refs #13966

* small extra fix: no need to .slice() cstring in JS
This commit is contained in:
hlaaftana 2020-04-29 09:59:08 +03:00 • committed by GitHub
commit 800ce5b950
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/jsgen.nim
View file

@ -1161,9 +1161,9 @@ proc genArrayAddr(p: PProc, n: PNode, r: var TCompRes) =
first = firstOrd(p.config, typ[0]) first = firstOrd(p.config, typ[0])
if optBoundsCheck in p.options: if optBoundsCheck in p.options:
useMagic(p, "chckIndx") useMagic(p, "chckIndx")
r.res = "chckIndx($1, $2, ($3 != null ? $3.length : 0)+$2-1)-$2" % [b.res, rope(first), tmp] r.res = "chckIndx($1, $2, ($3 != null ? $3.length : 0)+$2-1)-($2)" % [b.res, rope(first), tmp]
elif first != 0: elif first != 0:
r.res = "($1)-$2" % [b.res, rope(first)] r.res = "($1)-($2)" % [b.res, rope(first)]
else: else:
r.res = b.res r.res = b.res
r.kind = resExpr r.kind = resExpr
@ -1897,8 +1897,8 @@ proc genMagic(p: PProc, n: PNode, r: var TCompRes) =
let rhsIsLit = n[2].kind in nkStrKinds let rhsIsLit = n[2].kind in nkStrKinds
let (a, tmp) = maybeMakeTemp(p, n[1], lhs) let (a, tmp) = maybeMakeTemp(p, n[1], lhs)
if skipTypes(n[1].typ, abstractVarRange).kind == tyCString: if skipTypes(n[1].typ, abstractVarRange).kind == tyCString:
r.res = "if ($1 != null) { $4 += $2; } else { $4 = $2$3; }" % [ r.res = "if ($1 != null) { $3 += $2; } else { $3 = $2; }" % [
a, rhs.rdLoc, if rhsIsLit: nil else: ~".slice()", tmp] a, rhs.rdLoc, tmp]
else: else:
r.res = "if ($1 != null) { $4 = ($4).concat($2); } else { $4 = $2$3; }" % [ r.res = "if ($1 != null) { $4 = ($4).concat($2); } else { $4 = $2$3; }" % [
lhs.rdLoc, rhs.rdLoc, if rhsIsLit: nil else: ~".slice()", tmp] lhs.rdLoc, rhs.rdLoc, if rhsIsLit: nil else: ~".slice()", tmp]

6
tests/js/tarrayboundscheck.nim
View file

@ -40,5 +40,11 @@ proc test_arrayboundscheck() =
except: except:
echo "idx out of bounds: ", i echo "idx out of bounds: ", i
# #13966
var negativeIndexed: array[-2..2, int] = [0, 1, 2, 3, 4]
negativeIndexed[-1] = 2
negativeIndexed[1] = 2
doAssert negativeIndexed == [0, 2, 2, 2, 4]
test_arrayboundscheck() test_arrayboundscheck()
{.pop.} {.pop.}