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

new string behaviour now available under nimShallowStrings

Browse source
This commit is contained in:
Andreas Rumpf 2017-09-22 10:15:30 +02:00
commit fe99495a9b
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/system/sysstr.nim
View file

@ -95,10 +95,7 @@ proc cstrToNimstr(str: cstring): NimString {.compilerRtl.} =
if str == nil: NimString(nil) if str == nil: NimString(nil)
else: toNimStr(str, str.len) else: toNimStr(str, str.len)
when defined(nimImmutableStrings): template wasMoved(x: NimString): bool = (x.reserved and seqShallowFlag) != 0
template wasMoved(x: NimString): bool = (x.reserved and seqShallowFlag) != 0
else:
template wasMoved(x: NimString): bool = false
proc copyString(src: NimString): NimString {.compilerRtl.} = proc copyString(src: NimString): NimString {.compilerRtl.} =
if src != nil: if src != nil:
@ -109,7 +106,7 @@ proc copyString(src: NimString): NimString {.compilerRtl.} =
result.len = src.len result.len = src.len
copyMem(addr(result.data), addr(src.data), src.len + 1) copyMem(addr(result.data), addr(src.data), src.len + 1)
sysAssert((seqShallowFlag and result.reserved) == 0, "copyString") sysAssert((seqShallowFlag and result.reserved) == 0, "copyString")
when defined(nimImmutableStrings): when defined(nimShallowStrings):
if (src.reserved and strlitFlag) != 0: if (src.reserved and strlitFlag) != 0:
result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag
@ -132,7 +129,7 @@ proc copyStringRC1(src: NimString): NimString {.compilerRtl.} =
result.len = src.len result.len = src.len
copyMem(addr(result.data), addr(src.data), src.len + 1) copyMem(addr(result.data), addr(src.data), src.len + 1)
sysAssert((seqShallowFlag and result.reserved) == 0, "copyStringRC1") sysAssert((seqShallowFlag and result.reserved) == 0, "copyStringRC1")
when defined(nimImmutableStrings): when defined(nimShallowStrings):
if (src.reserved and strlitFlag) != 0: if (src.reserved and strlitFlag) != 0:
result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag