Skip to content

Commit a26bdcc

Browse files
plokhotnyukplokhotnyuk
committed
Code clean up
1 parent 8897d69 commit a26bdcc

File tree

3 files changed

+13
-13
lines changed
  • jsoniter-scala-core

3 files changed

+13
-13
lines changed

‎jsoniter-scala-core/js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,7 @@ final class JsonReader private[jsoniter_scala](
23192319
else if (e10 >= 310) Double.PositiveInfinity
23202320
else {
23212321
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2322-
var m2 = unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343)) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
2322+
var m2 = unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
23232323
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
23242324
shift = java.lang.Long.numberOfLeadingZeros(m2)
23252325
m2 <<= shift
@@ -2463,7 +2463,7 @@ final class JsonReader private[jsoniter_scala](
24632463
else if (e10 >= 39) Float.PositiveInfinity
24642464
else {
24652465
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2466-
var m2 = unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343)) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
2466+
var m2 = unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
24672467
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
24682468
shift = java.lang.Long.numberOfLeadingZeros(m2)
24692469
m2 <<= shift

‎jsoniter-scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ final class JsonReader private[jsoniter_scala](
22892289
else if (e10 >= 310) Double.PositiveInfinity
22902290
else {
22912291
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2292-
var m2 = unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343)) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
2292+
var m2 = unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
22932293
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
22942294
shift = java.lang.Long.numberOfLeadingZeros(m2)
22952295
m2 <<= shift
@@ -2433,7 +2433,7 @@ final class JsonReader private[jsoniter_scala](
24332433
else if (e10 >= 39) Float.PositiveInfinity
24342434
else {
24352435
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2436-
var m2 = unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343)) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
2436+
var m2 = unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
24372437
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
24382438
shift = java.lang.Long.numberOfLeadingZeros(m2)
24392439
m2 <<= shift
@@ -2468,7 +2468,7 @@ final class JsonReader private[jsoniter_scala](
24682468
}
24692469

24702470
private[this] def unsignedMultiplyHigh(x: Long, y: Long): Long =
2471-
Math.multiplyHigh(x, y) + (x + y) // Use implementation that works only when both params are negative
2471+
Math.multiplyHigh(x, y) + x + y // Use implementation that works only when both params are negative
24722472

24732473
private[this] def parseBigInt(isToken: Boolean, default: BigInt, digitsLimit: Int): BigInt = {
24742474
var b =
@@ -2850,9 +2850,9 @@ final class JsonReader private[jsoniter_scala](
28502850
while (i >= first) {
28512851
val m = ByteArrayAccess.getLong(magnitude, i)
28522852
val p = m * q
2853-
val s = p + x
2854-
x = Math.multiplyHigh(m, q) + (m >> 63 & q) + ((~s & p) >>> 63) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
2855-
ByteArrayAccess.setLong(magnitude, i, s)
2853+
x += p
2854+
ByteArrayAccess.setLong(magnitude, i, x)
2855+
x = Math.multiplyHigh(m, q) + (m >> 63 & q) + ((~x & p) >>> 63) // FIXME: Use Math.unsignedMultiplyHigh after dropping of JDK 17 support
28562856
i -= 8
28572857
}
28582858
}

‎jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ final class JsonReader private[jsoniter_scala](
22892289
else if (e10 >= 310) Double.PositiveInfinity
22902290
else {
22912291
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2292-
var m2 = NativeMath.unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343))
2292+
var m2 = NativeMath.unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift)
22932293
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
22942294
shift = java.lang.Long.numberOfLeadingZeros(m2)
22952295
m2 <<= shift
@@ -2433,7 +2433,7 @@ final class JsonReader private[jsoniter_scala](
24332433
else if (e10 >= 39) Float.PositiveInfinity
24342434
else {
24352435
var shift = java.lang.Long.numberOfLeadingZeros(m10)
2436-
var m2 = NativeMath.unsignedMultiplyHigh(m10 << shift, pow10Mantissas(e10 + 343))
2436+
var m2 = NativeMath.unsignedMultiplyHigh(pow10Mantissas(e10 + 343), m10 << shift)
24372437
var e2 = (e10 * 108853 >> 15) - shift + 1 // (e10 * Math.log(10) / Math.log(2)).toInt - shift + 1
24382438
shift = java.lang.Long.numberOfLeadingZeros(m2)
24392439
m2 <<= shift
@@ -2847,9 +2847,9 @@ final class JsonReader private[jsoniter_scala](
28472847
while (i >= first) {
28482848
val m = ByteArrayAccess.getLong(magnitude, i)
28492849
val p = m * q
2850-
val s = p + x
2851-
x = NativeMath.unsignedMultiplyHigh(m, q) + ((~s & p) >>> 63)
2852-
ByteArrayAccess.setLong(magnitude, i, s)
2850+
x += p
2851+
ByteArrayAccess.setLong(magnitude, i, x)
2852+
x = NativeMath.unsignedMultiplyHigh(m, q) + ((~x & p) >>> 63)
28532853
i -= 8
28542854
}
28552855
}

0 commit comments

Comments
 (0)