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

Fix newWideCString(cstring, int)

Browse source
This commit is contained in:
Dmitry Polienko 2016-07-19 20:37:26 -07:00
commit c768fea630
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/system/widestrs.nim
View file

@ -73,11 +73,11 @@ template fastRuneAt(s: cstring, i: int, result: expr, doInc = true) =
result = 0xFFFD result = 0xFFFD
when doInc: inc(i) when doInc: inc(i)
iterator runes(s: cstring): int = iterator runes(s: cstring, L: int): int =
var var
i = 0 i = 0
result: int result: int
while s[i] != '\0': while i < L:
fastRuneAt(s, i, result, true) fastRuneAt(s, i, result, true)
yield result yield result
@ -85,7 +85,7 @@ proc newWideCString*(source: cstring, L: int): WideCString =
unsafeNew(result, L * 4 + 2) unsafeNew(result, L * 4 + 2)
#result = cast[wideCString](alloc(L * 4 + 2)) #result = cast[wideCString](alloc(L * 4 + 2))
var d = 0 var d = 0
for ch in runes(source): for ch in runes(source, L):
if ch <=% UNI_MAX_BMP: if ch <=% UNI_MAX_BMP:
if ch >=% UNI_SUR_HIGH_START and ch <=% UNI_SUR_LOW_END: if ch >=% UNI_SUR_HIGH_START and ch <=% UNI_SUR_LOW_END:
result[d] = UNI_REPLACEMENT_CHAR result[d] = UNI_REPLACEMENT_CHAR