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

fixes #17768 [backport:1.4] (#18317)

Browse source 
* fixes #17768 [backport:1.4]

* tiny
This commit is contained in:
flywind 2021-06-21 18:50:47 +08:00 • committed by GitHub
commit 2deb7011f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pure/unicode.nim
View file

@ -333,7 +333,7 @@ proc runeReverseOffset*(s: string, rev: Positive): (int, int) =
## from the end (starting with 1) and the total ## from the end (starting with 1) and the total
## number of runes in the string. ## number of runes in the string.
## ##
## Returns a negative value for offset if there are to few runes in ## Returns a negative value for offset if there are too few runes in
## the string to satisfy the request. ## the string to satisfy the request.
## ##
## **Beware:** This can lead to unoptimized code and slow execution! ## **Beware:** This can lead to unoptimized code and slow execution!
@ -346,16 +346,14 @@ proc runeReverseOffset*(s: string, rev: Positive): (int, int) =
a = rev.int a = rev.int
o = 0 o = 0
x = 0 x = 0
let times = 2*rev.int-s.runeLen # transformed from rev.int - a < s.runeLen - rev.int
while o < s.len: while o < s.len:
let r = runeLenAt(s, o) let r = runeLenAt(s, o)
o += r o += r
if a < 0: if a > times:
x += r x += r
dec a dec a
result = if a > 0: (-a, rev.int-a) else: (x, -a+rev.int)
if a > 0:
return (-a, rev.int-a)
return (x, -a+rev.int)
proc runeAtPos*(s: string, pos: int): Rune = proc runeAtPos*(s: string, pos: int): Rune =
## Returns the rune at position ``pos``. ## Returns the rune at position ``pos``.

9
tests/stdlib/tunicode.nim
View file

@ -1,4 +1,4 @@
import unicode import std/unicode
proc asRune(s: static[string]): Rune = proc asRune(s: static[string]): Rune =
@ -213,3 +213,10 @@ block differentSizes:
doAssert swapCase("ⱥbCd") == "ȺBcD" doAssert swapCase("ⱥbCd") == "ȺBcD"
doAssert swapCase("XyꟆaB") == "xYᶎAb" doAssert swapCase("XyꟆaB") == "xYᶎAb"
doAssert swapCase("aᵹcᲈd") == "AꝽCꙊD" doAssert swapCase("aᵹcᲈd") == "AꝽCꙊD"
block: # bug #17768
let s1 = "abcdef"
let s2 = "abcdéf"
doAssert s1.runeSubstr(0, -1) == "abcde"
doAssert s2.runeSubstr(0, -1) == "abcdé"