diff options
Diffstat (limited to 'lib/system')
| -rw-r--r-- | lib/system/gc_common.nim | 4 | ||||
| -rw-r--r-- | lib/system/sysstr.nim | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/system/gc_common.nim b/lib/system/gc_common.nim index 939776a58..711a610bf 100644 --- a/lib/system/gc_common.nim +++ b/lib/system/gc_common.nim @@ -431,9 +431,9 @@ type GlobalMarkerProc = proc () {.nimcall, benign.} var globalMarkersLen: int - globalMarkers: array[0.. 3499, GlobalMarkerProc] + globalMarkers: array[0..3499, GlobalMarkerProc] threadLocalMarkersLen: int - threadLocalMarkers: array[0.. 3499, GlobalMarkerProc] + threadLocalMarkers: array[0..3499, GlobalMarkerProc] gHeapidGenerator: int proc nimRegisterGlobalMarker(markerProc: GlobalMarkerProc) {.compilerProc.} = diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim index 7b81f54da..90ae91cf5 100644 --- a/lib/system/sysstr.nim +++ b/lib/system/sysstr.nim @@ -94,8 +94,8 @@ proc mnewString(len: int): NimString {.compilerProc.} = result.len = len proc copyStrLast(s: NimString, start, last: int): NimString {.compilerProc.} = - var start = max(start, 0) - var len = min(last, s.len-1) - start + 1 + let start = max(start, 0) + let len = min(last, s.len-1) - start + 1 if len > 0: result = rawNewStringNoInit(len) result.len = len @@ -104,6 +104,10 @@ proc copyStrLast(s: NimString, start, last: int): NimString {.compilerProc.} = else: result = rawNewString(len) +proc nimToCStringConv(s: NimString): cstring {.compilerProc, inline.} = + if s == nil or s.len == 0: result = cstring"" + else: result = cstring(addr s.data) + proc copyStr(s: NimString, start: int): NimString {.compilerProc.} = result = copyStrLast(s, start, s.len-1) |