Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* fixes nim-lang#17173

* add testcase (nim-lang#17214)

* Apply suggestions from code review

* fix for newruntime

* Apply suggestions from code review

* Update lib/system.nim

* Update lib/system.nim

* Update lib/system.nim

Co-authored-by: Danil Yarantsev <tiberiumk12@gmail.com>

Co-authored-by: flywind <xzsflywind@gmail.com>
Co-authored-by: Danil Yarantsev <tiberiumk12@gmail.com>
  • Loading branch information
3 people committed Mar 22, 2021
1 parent e9a7a88 commit 1c6e81e
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 2 deletions.
8 changes: 7 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ with other backends. see #9125. Use `-d:nimLegacyJsRound` for previous behavior.

- Deprecated `any`. See https://github.com/nim-lang/RFCs/issues/281

- Added `std/sysrand` module to get random numbers from a secure source
- Added `std/sysrand` module to get random numbers from a secure source
provided by the operating system.

- Added optional `options` argument to `copyFile`, `copyFileToDir`, and
Expand Down Expand Up @@ -173,6 +173,12 @@ provided by the operating system.
dumping (on select signals) and notifying the parent process about the cause
of termination.

- Added `system.prepareStrMutation` for better support of low
level `moveMem`, `copyMem` operations for Orc's copy-on-write string
implementation.

- `hashes.hash` now supports `object`, but can be overloaded.

- Added `std/strbasics` for high performance string operations.
Added `strip`, `setSlice`, `add(a: var string, b: openArray[char])`.

Expand Down
4 changes: 3 additions & 1 deletion lib/std/strbasics.nim
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@ func setSlice*(s: var string, slice: Slice[int]) =
when not declared(moveMem):
impl()
else:
when defined(nimSeqsV2):
prepareStrMutation(s)
moveMem(addr s[0], addr s[first], last - first + 1)
s.setLen(last - first + 1)

func strip*(a: var string, leading = true, trailing = true, chars: set[char] = whitespaces) {.inline.} =
## Inplace version of `strip`. Strips leading or
## Inplace version of `strip`. Strips leading or
## trailing `chars` (default: whitespace characters).
##
## If `leading` is true (default), leading `chars` are stripped.
Expand Down
6 changes: 6 additions & 0 deletions lib/system.nim
Original file line number Diff line number Diff line change
Expand Up @@ -3127,3 +3127,9 @@ export io

when not defined(createNimHcr) and not defined(nimscript):
include nimhcr

when notJSnotNims and not defined(nimSeqsV2):
proc prepareStrMutation*(s: var string) {.inline.} =
## String literals (e.g. "abc", etc) in the ARC/ORC mode are "copy on write",
## therefore you should call `prepareStrMutation` before modifying the strings.
discard
7 changes: 7 additions & 0 deletions lib/system/strs_v2.nim
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,10 @@ proc nimPrepareStrMutationImpl(s: var NimStringV2) =
proc nimPrepareStrMutationV2(s: var NimStringV2) {.compilerRtl, inline.} =
if s.p != nil and (s.p.cap and strlitFlag) == strlitFlag:
nimPrepareStrMutationImpl(s)

proc prepareStrMutation*(s: var string) {.inline.} =
# string literals are "copy on write", so you need to call
# `prepareStrMutation` before modifying the strings.
{.cast(noSideEffect).}:
let s = unsafeAddr s
nimPrepareStrMutationV2(cast[ptr NimStringV2](s)[])
10 changes: 10 additions & 0 deletions tests/arc/t17173.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
discard """
matrix: "--gc:refc; --gc:arc; --newruntime"
"""

import std/strbasics


var a = " vhellov "
strip(a)
doAssert a == "vhellov"

0 comments on commit 1c6e81e

Please sign in to comment.