mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-25 16:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert adding generic V: Ordinal parameter to succ, pred, inc, dec (#22328)

Browse Source 
* Use `int` in `digitsutils`, `dragonbox`, `schubfach`

* Fix error message
This commit is contained in:
konsumlamm
2023-08-05 18:38:46 +02:00
committed by GitHub
parent 873eaa3f65
commit e15e19308e
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/private/digitsutils.nim
View File

@@ -33,8 +33,8 @@ proc utoa2Digits*(buf: var openArray[char]; pos: int; digits: uint32) {.inline.}
buf[pos+1] = digits100[2 * digits + 1]
#copyMem(buf, unsafeAddr(digits100[2 * digits]), 2 * sizeof((char)))
proc trailingZeros2Digits*(digits: uint32): int32 {.inline.} =
return trailingZeros100[digits.int8]
proc trailingZeros2Digits*(digits: uint32): int {.inline.} =
trailingZeros100[digits]
when defined(js):
proc numToString(a: SomeInteger): cstring {.importjs: "((#) + \"\")".}

10
lib/std/private/dragonbox.nim
View File

@@ -1052,7 +1052,7 @@ when false:
proc memset(x: cstring; ch: char; L: int) {.importc, nodecl.}
proc memmove(a, b: cstring; L: int) {.importc, nodecl.}
proc utoa8DigitsSkipTrailingZeros*(buf: var openArray[char]; pos: int; digits: uint32): int32 {.inline.} =
proc utoa8DigitsSkipTrailingZeros*(buf: var openArray[char]; pos: int; digits: uint32): int {.inline.} =
dragonbox_Assert(digits >= 1)
dragonbox_Assert(digits <= 99999999'u32)
let q: uint32 = digits div 10000
@@ -1070,12 +1070,12 @@ proc utoa8DigitsSkipTrailingZeros*(buf: var openArray[char]; pos: int; digits: u
utoa2Digits(buf, pos + 6, rL)
return trailingZeros2Digits(if rL == 0: rH else: rL) + (if rL == 0: 2 else: 0)
proc printDecimalDigitsBackwards*(buf: var openArray[char]; pos: int; output64: uint64): int32 {.inline.} =
proc printDecimalDigitsBackwards*(buf: var openArray[char]; pos: int; output64: uint64): int {.inline.} =
var pos = pos
var output64 = output64
var tz: int32 = 0
var tz = 0
## number of trailing zeros removed.
var nd: int32 = 0
var nd = 0
## number of decimal digits processed.
## At most 17 digits remaining
if output64 >= 100000000'u64:
@@ -1220,7 +1220,7 @@ proc formatDigits*[T: Ordinal](buffer: var openArray[char]; pos: T; digits: uint
## dE+123 or d.igitsE+123
decimalDigitsPosition = 1
var digitsEnd = pos + int(decimalDigitsPosition + numDigits)
let tz: int32 = printDecimalDigitsBackwards(buffer, digitsEnd, digits)
let tz = printDecimalDigitsBackwards(buffer, digitsEnd, digits)
dec(digitsEnd, tz)
dec(numDigits, tz)
## decimal_exponent += tz; // => decimal_point unchanged.

8
lib/std/private/schubfach.nim
View File

@@ -244,12 +244,12 @@ proc toDecimal32(ieeeSignificand: uint32; ieeeExponent: uint32): FloatingDecimal
## ToChars
## ==================================================================================================
proc printDecimalDigitsBackwards[T: Ordinal](buf: var openArray[char]; pos: T; output: uint32): int32 {.inline.} =
proc printDecimalDigitsBackwards[T: Ordinal](buf: var openArray[char]; pos: T; output: uint32): int {.inline.} =
var output = output
var pos = pos
var tz: int32 = 0
var tz = 0
## number of trailing zeros removed.
var nd: int32 = 0
var nd = 0
## number of decimal digits processed.
## At most 9 digits remaining
if output >= 10000:
@@ -355,7 +355,7 @@ proc formatDigits[T: Ordinal](buffer: var openArray[char]; pos: T; digits: uint3
## dE+123 or d.igitsE+123
decimalDigitsPosition = 1
var digitsEnd = pos + decimalDigitsPosition + numDigits
let tz: int32 = printDecimalDigitsBackwards(buffer, digitsEnd, digits)
let tz = printDecimalDigitsBackwards(buffer, digitsEnd, digits)
dec(digitsEnd, tz)
dec(numDigits, tz)
## decimal_exponent += tz; // => decimal_point unchanged.