diff options
| author | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
|---|---|---|
| committer | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
| commit | dcfc7a8896166563f6fd80fbab81bc50e0b5a217 (patch) | |
| tree | 4a247ec2d64bafec53e5ab24b0fda89642908a07 /compiler/rodutils.nim | |
| parent | a86c774932afd8b6782df1925837df9df04ef381 (diff) | |
| parent | 8b82004359b8d852fa0107d79cc78b21eb35c028 (diff) | |
| download | Nim-dcfc7a8896166563f6fd80fbab81bc50e0b5a217.tar.gz | |
resolved conflict
Diffstat (limited to 'compiler/rodutils.nim')
| -rw-r--r-- | compiler/rodutils.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rodutils.nim b/compiler/rodutils.nim index 0ee3b1ec4..4433ed4ab 100644 --- a/compiler/rodutils.nim +++ b/compiler/rodutils.nim @@ -12,7 +12,7 @@ import strutils proc c_sprintf(buf, frmt: cstring) {.importc: "sprintf", nodecl, varargs.} -proc ToStrMaxPrecision*(f: BiggestFloat): string = +proc toStrMaxPrecision*(f: BiggestFloat): string = if f != f: result = "NAN" elif f == 0.0: @@ -36,7 +36,7 @@ proc hexChar(c: char, xi: var int) = of '0'..'9': xi = (xi shl 4) or (ord(c) - ord('0')) of 'a'..'f': xi = (xi shl 4) or (ord(c) - ord('a') + 10) of 'A'..'F': xi = (xi shl 4) or (ord(c) - ord('A') + 10) - else: nil + else: discard proc decodeStr*(s: cstring, pos: var int): string = var i = pos @@ -119,7 +119,7 @@ template decodeIntImpl() = proc decodeVInt*(s: cstring, pos: var int): int = decodeIntImpl() -proc decodeVBiggestInt*(s: cstring, pos: var int): biggestInt = +proc decodeVBiggestInt*(s: cstring, pos: var int): BiggestInt = decodeIntImpl() iterator decodeVIntArray*(s: cstring): int = |