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

newruntime: make system.delete and friends work with owned ref (bugfix); reported on the forum

Browse source
This commit is contained in:
Araq 2019-08-05 00:14:30 +02:00
commit 61c66abbfe
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/system.nim
View file

@ -143,7 +143,7 @@ when defined(nimHasRunnableExamples):
## assert double(5) == 10 ## assert double(5) == 10
## block: ## at block scope ## block: ## at block scope
## defer: echo "done" ## defer: echo "done"
## ##
## result = 2 * x ## result = 2 * x
else: else:
template runnableExamples*(body: untyped) = template runnableExamples*(body: untyped) =
@ -2113,6 +2113,13 @@ proc add*[T](x: var seq[T], y: openArray[T]) {.noSideEffect.} =
setLen(x, xl + y.len) setLen(x, xl + y.len)
for i in 0..high(y): x[xl+i] = y[i] for i in 0..high(y): x[xl+i] = y[i]
when defined(nimV2):
template movingCopy(a, b) =
a = move(b)
else:
template movingCopy(a, b) =
shallowCopy(a, b)
proc del*[T](x: var seq[T], i: Natural) {.noSideEffect.} = proc del*[T](x: var seq[T], i: Natural) {.noSideEffect.} =
## Deletes the item at index `i` by putting ``x[high(x)]`` into position `i`. ## Deletes the item at index `i` by putting ``x[high(x)]`` into position `i`.
## ##
@ -2125,7 +2132,7 @@ proc del*[T](x: var seq[T], i: Natural) {.noSideEffect.} =
## var i = @[1, 2, 3, 4, 5] ## var i = @[1, 2, 3, 4, 5]
## i.del(2) # => @[1, 2, 5, 4] ## i.del(2) # => @[1, 2, 5, 4]
let xl = x.len - 1 let xl = x.len - 1
shallowCopy(x[i], x[xl]) movingCopy(x[i], x[xl])
setLen(x, xl) setLen(x, xl)
proc delete*[T](x: var seq[T], i: Natural) {.noSideEffect.} = proc delete*[T](x: var seq[T], i: Natural) {.noSideEffect.} =
@ -2141,7 +2148,7 @@ proc delete*[T](x: var seq[T], i: Natural) {.noSideEffect.} =
## i.delete(2) # => @[1, 2, 4, 5] ## i.delete(2) # => @[1, 2, 4, 5]
template defaultImpl = template defaultImpl =
let xl = x.len let xl = x.len
for j in i.int..xl-2: shallowCopy(x[j], x[j+1]) for j in i.int..xl-2: movingCopy(x[j], x[j+1])
setLen(x, xl-1) setLen(x, xl-1)
when nimvm: when nimvm:
@ -2163,7 +2170,7 @@ proc insert*[T](x: var seq[T], item: T, i = 0.Natural) {.noSideEffect.} =
setLen(x, xl+1) setLen(x, xl+1)
var j = xl-1 var j = xl-1
while j >= i: while j >= i:
shallowCopy(x[j+1], x[j]) movingCopy(x[j+1], x[j])
dec(j) dec(j)
when nimvm: when nimvm:
defaultImpl() defaultImpl()
@ -3914,9 +3921,9 @@ template spliceImpl(s, a, L, b: untyped): untyped =
if shift > 0: if shift > 0:
# enlarge: # enlarge:
setLen(s, newLen) setLen(s, newLen)
for i in countdown(newLen-1, a+b.len): shallowCopy(s[i], s[i-shift]) for i in countdown(newLen-1, a+b.len): movingCopy(s[i], s[i-shift])
else: else:
for i in countup(a+b.len, newLen-1): shallowCopy(s[i], s[i-shift]) for i in countup(a+b.len, newLen-1): movingCopy(s[i], s[i-shift])
# cut down: # cut down:
setLen(s, newLen) setLen(s, newLen)
# fill the hole: # fill the hole: