mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-08 21:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmp(x, y: string) now uses memcmp rather than strcmp (#6869) (#6968)

Browse Source
This commit is contained in:
Mathias Stearn
2017-12-24 09:23:17 -05:00
committed by Andreas Rumpf
parent ca9f3b47d4
commit 6bd3a2826f
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/system.nim
View File

@@ -2916,7 +2916,10 @@ when not defined(JS): #and not defined(nimscript):
elif x > y: result = 1
else: result = 0
else:
result = int(c_strcmp(x, y))
let minlen = min(x.len, y.len)
result = int(c_memcmp(x.cstring, y.cstring, minlen.csize))
if result == 0:
result = x.len - y.len
when defined(nimscript):
proc readFile*(filename: string): string {.tags: [ReadIOEffect], benign.}

8
lib/system/sysstr.nim
View File

@@ -24,10 +24,10 @@ proc cmpStrings(a, b: NimString): int {.inline, compilerProc.} =
if a == b: return 0
if a == nil: return -1
if b == nil: return 1
when defined(nimNoArrayToCstringConversion):
return c_strcmp(addr a.data, addr b.data)
else:
return c_strcmp(a.data, b.data)
let minlen = min(a.len, b.len)
result = c_memcmp(addr a.data, addr b.data, minlen.csize)
if result == 0:
result = a.len - b.len
proc eqStrings(a, b: NimString): bool {.inline, compilerProc.} =
if a == b: return true