diff options
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/pure/strutils.nim | 26 | ||||
-rwxr-xr-x | lib/system/systhread.nim | 20 |
2 files changed, 33 insertions, 13 deletions
diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim index f5adf1abb..81ca75417 100755 --- a/lib/pure/strutils.nim +++ b/lib/pure/strutils.nim @@ -449,8 +449,20 @@ proc repeatChar*(count: int, c: Char = ' '): string {.noSideEffect, ## Returns a string of length `count` consisting only of ## the character `c`. result = newString(count) - for i in 0..count-1: - result[i] = c + for i in 0..count-1: result[i] = c + +proc align*(s: string, count: int): string {. + noSideEffect, rtl, extern: "nsuAlignString".} = + ## Aligns a string `s` with spaces, so that is of length `count`. Spaces are + ## added before `s` resulting in right alignment. If ``s.len >= count``, no + ## spaces are added and `s` is returned unchanged. + if s.len < count: + result = newString(count) + var spaces = count - s.len + for i in 0..spaces-1: result[i] = ' ' + for i in spaces..count-1: result[i] = s[i-spaces] + else: + result = s proc startsWith*(s, prefix: string): bool {.noSideEffect, rtl, extern: "nsuStartsWith".} = @@ -739,7 +751,7 @@ proc validEmailAddress*(s: string): bool {.noSideEffect, rtl, extern: "nsuValidEmailAddress".} = ## returns true if `s` seems to be a valid e-mail address. ## The checking also uses a domain list. - ## Note: This will be moved into another module soon. + ## Note: This will be moved to another module soon. const chars = Letters + Digits + {'!','#','$','%','&', '\'','*','+','/','=','?','^','_','`','{','}','|','~','-','.'} @@ -862,3 +874,11 @@ proc editDistance*(a, b: string): int {.noSideEffect, #dealloc(row) {.pop.} + +when isMainModule: + assert align("abc", 4) == " abc" + assert align("a", 0) == "a" + assert align("1232", 6) == " 1232" + + + diff --git a/lib/system/systhread.nim b/lib/system/systhread.nim index 70447f288..a124fa92f 100755 --- a/lib/system/systhread.nim +++ b/lib/system/systhread.nim @@ -88,19 +88,19 @@ type TLock* = TSysLock TThreadFunc* = proc (closure: pointer) {.cdecl.} -DWORD WINAPI SuspendThread( - __in HANDLE hThread -); -DWORD WINAPI ResumeThread( - __in HANDLE hThread -); -DWORD WINAPI ThreadProc( - __in LPVOID lpParameter -); +#DWORD WINAPI SuspendThread( +# __in HANDLE hThread +#); +#DWORD WINAPI ResumeThread( +# __in HANDLE hThread +#); +#DWORD WINAPI ThreadProc( +# __in LPVOID lpParameter +#); proc createThread*(t: var TThread, fn: TThreadFunc, closure: pointer) = when defined(windows): - + nil else: nil #pthread_create( |