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

fixes #9281

Browse source
This commit is contained in:
Araq 2018-10-11 19:52:48 +02:00
commit d48e964950
3 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/ccgexprs.nim
View file

@ -1533,8 +1533,19 @@ proc genArrayLen(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
var typ = skipTypes(a.typ, abstractVar + tyUserTypeClasses) var typ = skipTypes(a.typ, abstractVar + tyUserTypeClasses)
case typ.kind case typ.kind
of tyOpenArray, tyVarargs: of tyOpenArray, tyVarargs:
if op == mHigh: unaryExpr(p, e, d, "($1Len_0-1)") # Bug #9279, len(toOpenArray()) has to work:
else: unaryExpr(p, e, d, "$1Len_0") if a.kind in nkCallKinds and a[0].kind == nkSym and a[0].sym.magic == mSlice:
# magic: pass slice to openArray:
var b, c: TLoc
initLocExpr(p, a[2], b)
initLocExpr(p, a[3], c)
if op == mHigh:
putIntoDest(p, d, e, ropecg(p.module, "($2)-($1)", [rdLoc(b), rdLoc(c)]))
else:
putIntoDest(p, d, e, ropecg(p.module, "($2)-($1)+1", [rdLoc(b), rdLoc(c)]))
else:
if op == mHigh: unaryExpr(p, e, d, "($1Len_0-1)")
else: unaryExpr(p, e, d, "$1Len_0")
of tyCString: of tyCString:
if op == mHigh: unaryExpr(p, e, d, "($1 ? (#nimCStrLen($1)-1) : -1)") if op == mHigh: unaryExpr(p, e, d, "($1 ? (#nimCStrLen($1)-1) : -1)")
else: unaryExpr(p, e, d, "($1 ? #nimCStrLen($1) : 0)") else: unaryExpr(p, e, d, "($1 ? #nimCStrLen($1) : 0)")
@ -2020,6 +2031,9 @@ proc genMagicExpr(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
of mDotDot, mEqCString: genCall(p, e, d) of mDotDot, mEqCString: genCall(p, e, d)
of mWasMoved: genWasMoved(p, e) of mWasMoved: genWasMoved(p, e)
of mMove: genMove(p, e, d) of mMove: genMove(p, e, d)
of mSlice:
localError(p.config, e.info, "invalid context for 'toOpenArray'; " &
" 'toOpenArray' is only valid within a call expression")
else: else:
when defined(debugMagics): when defined(debugMagics):
echo p.prc.name.s, " ", p.prc.id, " ", p.prc.flags, " ", p.prc.ast[genericParamsPos].kind echo p.prc.name.s, " ", p.prc.id, " ", p.prc.flags, " ", p.prc.ast[genericParamsPos].kind

2
compiler/reorder.nim
View file

@ -238,7 +238,7 @@ proc mergeSections(conf: ConfigRef; comps: seq[seq[DepN]], res: PNode) =
var sn = newNode(ckind) var sn = newNode(ckind)
sn.add cs[i].pnode[0] sn.add cs[i].pnode[0]
inc i inc i
while i < cs.len and cs[i].pnode.kind == ckind : while i < cs.len and cs[i].pnode.kind == ckind:
sn.add cs[i].pnode[0] sn.add cs[i].pnode[0]
inc i inc i
res.add sn res.add sn

15
tests/system/tsystem_misc.nim
View file

@ -25,6 +25,7 @@ discard """
55 55
56 56
57 57
2
''' '''
""" """
@ -102,3 +103,17 @@ proc foo(a: openArray[byte]) =
let str = "0123456789" let str = "0123456789"
foo(toOpenArrayByte(str, 0, str.high)) foo(toOpenArrayByte(str, 0, str.high))
template boundedOpenArray[T](x: seq[T], first, last: int): openarray[T] =
toOpenarray(x, max(0, first), min(x.high, last))
# bug #9281
proc foo[T](x: openarray[T]) =
echo x.len
let a = @[1, 2, 3]
# a.boundedOpenArray(1, 2).foo() # Works
echo a.boundedOpenArray(1, 2).len # Internal compiler error