Skip to content

Commit f2d3867

Browse files
plokhotnyukplokhotnyuk
committed
Code clean up
1 parent 96f708e commit f2d3867

File tree

3 files changed

+33
-45
lines changed
  • jsoniter-scala-core

3 files changed

+33
-45
lines changed

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,9 +2274,8 @@ final class JsonReader private[jsoniter_scala](
22742274
}
22752275
if ((b | 0x20) == 'e') {
22762276
b = nextByte(pos + 1)
2277-
var isNegExp = false
2278-
if (b == '-') isNegExp = true
2279-
if (isNegExp || b == '+') b = nextByte(head)
2277+
val sb = b
2278+
if (b == '-' || b == '+') b = nextByte(head)
22802279
if (b < '0' || b > '9') numberError()
22812280
var exp = b - '0'
22822281
pos = head
@@ -2292,7 +2291,7 @@ final class JsonReader private[jsoniter_scala](
22922291
if (exp < 214748364) exp = exp * 10 + (b - '0')
22932292
pos += 1
22942293
}
2295-
if (isNegExp) exp = -exp
2294+
if (sb == '-') exp = -exp
22962295
e10 += exp
22972296
}
22982297
head = pos
@@ -2423,9 +2422,8 @@ final class JsonReader private[jsoniter_scala](
24232422
}
24242423
if ((b | 0x20) == 'e') {
24252424
b = nextByte(pos + 1)
2426-
var isNegExp = false
2427-
if (b == '-') isNegExp = true
2428-
if (isNegExp || b == '+') b = nextByte(head)
2425+
val sb = b
2426+
if (b == '-' || b == '+') b = nextByte(head)
24292427
if (b < '0' || b > '9') numberError()
24302428
var exp = b - '0'
24312429
pos = head
@@ -2441,7 +2439,7 @@ final class JsonReader private[jsoniter_scala](
24412439
if (exp < 214748364) exp = exp * 10 + (b - '0')
24422440
pos += 1
24432441
}
2444-
if (isNegExp) exp = -exp
2442+
if (sb == '-') exp = -exp
24452443
e10 += exp
24462444
}
24472445
head = pos
@@ -2618,9 +2616,8 @@ final class JsonReader private[jsoniter_scala](
26182616
}
26192617
if ((b | 0x20) == 'e') {
26202618
b = nextByte(pos + 1)
2621-
var isNegExp = false
2622-
if (b == '-') isNegExp = true
2623-
if (isNegExp || b == '+') b = nextByte(head)
2619+
val sb = b
2620+
if (b == '-' || b == '+') b = nextByte(head)
26242621
if (b < '0' || b > '9') numberError()
26252622
var exp = (b - '0').toLong
26262623
pos = head
@@ -2637,10 +2634,9 @@ final class JsonReader private[jsoniter_scala](
26372634
if (exp > 2147483648L) numberError(pos)
26382635
pos += 1
26392636
}
2640-
scale =
2641-
if (isNegExp) exp.toInt
2642-
else if (exp == 2147483648L) numberError(pos - 1)
2643-
else -exp.toInt
2637+
if (sb == '-') scale = exp.toInt
2638+
else if (exp == 2147483648L) numberError(pos - 1)
2639+
else scale = -exp.toInt
26442640
}
26452641
head = pos
26462642
if (mark == 0) from -= newMark

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,9 +2244,8 @@ final class JsonReader private[jsoniter_scala](
22442244
}
22452245
if ((b | 0x20) == 'e') {
22462246
b = nextByte(pos + 1)
2247-
var isNegExp = false
2248-
if (b == '-') isNegExp = true
2249-
if (isNegExp || b == '+') b = nextByte(head)
2247+
val sb = b
2248+
if (b == '-' || b == '+') b = nextByte(head)
22502249
if (b < '0' || b > '9') numberError()
22512250
var exp = b - '0'
22522251
pos = head
@@ -2262,7 +2261,7 @@ final class JsonReader private[jsoniter_scala](
22622261
if (exp < 214748364) exp = exp * 10 + (b - '0')
22632262
pos += 1
22642263
}
2265-
if (isNegExp) exp = -exp
2264+
if (sb == '-') exp = -exp
22662265
e10 += exp
22672266
}
22682267
head = pos
@@ -2393,9 +2392,8 @@ final class JsonReader private[jsoniter_scala](
23932392
}
23942393
if ((b | 0x20) == 'e') {
23952394
b = nextByte(pos + 1)
2396-
var isNegExp = false
2397-
if (b == '-') isNegExp = true
2398-
if (isNegExp || b == '+') b = nextByte(head)
2395+
val sb = b
2396+
if (b == '-' || b == '+') b = nextByte(head)
23992397
if (b < '0' || b > '9') numberError()
24002398
var exp = b - '0'
24012399
pos = head
@@ -2411,7 +2409,7 @@ final class JsonReader private[jsoniter_scala](
24112409
if (exp < 214748364) exp = exp * 10 + (b - '0')
24122410
pos += 1
24132411
}
2414-
if (isNegExp) exp = -exp
2412+
if (sb == '-') exp = -exp
24152413
e10 += exp
24162414
}
24172415
head = pos
@@ -2631,9 +2629,8 @@ final class JsonReader private[jsoniter_scala](
26312629
}
26322630
if ((b | 0x20) == 'e') {
26332631
b = nextByte(pos + 1)
2634-
var isNegExp = false
2635-
if (b == '-') isNegExp = true
2636-
if (isNegExp || b == '+') b = nextByte(head)
2632+
val sb = b
2633+
if (b == '-' || b == '+') b = nextByte(head)
26372634
if (b < '0' || b > '9') numberError()
26382635
var exp = (b - '0').toLong
26392636
pos = head
@@ -2650,10 +2647,9 @@ final class JsonReader private[jsoniter_scala](
26502647
if (exp > 2147483648L) numberError(pos)
26512648
pos += 1
26522649
}
2653-
scale =
2654-
if (isNegExp) exp.toInt
2655-
else if (exp == 2147483648L) numberError(pos - 1)
2656-
else -exp.toInt
2650+
if (sb == '-') scale = exp.toInt
2651+
else if (exp == 2147483648L) numberError(pos - 1)
2652+
else scale = -exp.toInt
26572653
}
26582654
head = pos
26592655
if (mark == 0) from -= newMark

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,9 +2244,8 @@ final class JsonReader private[jsoniter_scala](
22442244
}
22452245
if ((b | 0x20) == 'e') {
22462246
b = nextByte(pos + 1)
2247-
var isNegExp = false
2248-
if (b == '-') isNegExp = true
2249-
if (isNegExp || b == '+') b = nextByte(head)
2247+
val sb = b
2248+
if (b == '-' || b == '+') b = nextByte(head)
22502249
if (b < '0' || b > '9') numberError()
22512250
var exp = b - '0'
22522251
pos = head
@@ -2262,7 +2261,7 @@ final class JsonReader private[jsoniter_scala](
22622261
if (exp < 214748364) exp = exp * 10 + (b - '0')
22632262
pos += 1
22642263
}
2265-
if (isNegExp) exp = -exp
2264+
if (sb == '-') exp = -exp
22662265
e10 += exp
22672266
}
22682267
head = pos
@@ -2393,9 +2392,8 @@ final class JsonReader private[jsoniter_scala](
23932392
}
23942393
if ((b | 0x20) == 'e') {
23952394
b = nextByte(pos + 1)
2396-
var isNegExp = false
2397-
if (b == '-') isNegExp = true
2398-
if (isNegExp || b == '+') b = nextByte(head)
2395+
val sb = b
2396+
if (b == '-' || b == '+') b = nextByte(head)
23992397
if (b < '0' || b > '9') numberError()
24002398
var exp = b - '0'
24012399
pos = head
@@ -2411,7 +2409,7 @@ final class JsonReader private[jsoniter_scala](
24112409
if (exp < 214748364) exp = exp * 10 + (b - '0')
24122410
pos += 1
24132411
}
2414-
if (isNegExp) exp = -exp
2412+
if (sb == '-') exp = -exp
24152413
e10 += exp
24162414
}
24172415
head = pos
@@ -2628,9 +2626,8 @@ final class JsonReader private[jsoniter_scala](
26282626
}
26292627
if ((b | 0x20) == 'e') {
26302628
b = nextByte(pos + 1)
2631-
var isNegExp = false
2632-
if (b == '-') isNegExp = true
2633-
if (isNegExp || b == '+') b = nextByte(head)
2629+
val sb = b
2630+
if (b == '-' || b == '+') b = nextByte(head)
26342631
if (b < '0' || b > '9') numberError()
26352632
var exp = (b - '0').toLong
26362633
pos = head
@@ -2647,10 +2644,9 @@ final class JsonReader private[jsoniter_scala](
26472644
if (exp > 2147483648L) numberError(pos)
26482645
pos += 1
26492646
}
2650-
scale =
2651-
if (isNegExp) exp.toInt
2652-
else if (exp == 2147483648L) numberError(pos - 1)
2653-
else -exp.toInt
2647+
if (sb == '-') scale = exp.toInt
2648+
else if (exp == 2147483648L) numberError(pos - 1)
2649+
else scale = -exp.toInt
26542650
}
26552651
head = pos
26562652
if (mark == 0) from -= newMark

0 commit comments

Comments
 (0)