Skip to content

Commit

Permalink
Code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
plokhotnyuk committed Feb 2, 2025
1 parent c4294f6 commit 88e4a06
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 46 deletions.
10 changes: 2 additions & 8 deletions zio-json/js/src/main/scala/zio/json/internal/SafeNumbers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ object SafeNumbers {
try LongSome(UnsafeNumbers.long(num))
catch { case _: UnexpectedEnd | UnsafeNumber => LongNone }

def bigInteger(
num: String,
max_bits: Int = 128
): Option[java.math.BigInteger] =
def bigInteger(num: String, max_bits: Int = 128): Option[java.math.BigInteger] =
try Some(UnsafeNumbers.bigInteger(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand All @@ -71,10 +68,7 @@ object SafeNumbers {
try DoubleSome(UnsafeNumbers.double(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => DoubleNone }

def bigDecimal(
num: String,
max_bits: Int = 128
): Option[java.math.BigDecimal] =
def bigDecimal(num: String, max_bits: Int = 128): Option[java.math.BigDecimal] =
try Some(UnsafeNumbers.bigDecimal(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand Down
10 changes: 2 additions & 8 deletions zio-json/jvm/src/main/scala/zio/json/internal/SafeNumbers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ object SafeNumbers {
try LongSome(UnsafeNumbers.long(num))
catch { case _: UnexpectedEnd | UnsafeNumber => LongNone }

def bigInteger(
num: String,
max_bits: Int = 128
): Option[java.math.BigInteger] =
def bigInteger(num: String, max_bits: Int = 128): Option[java.math.BigInteger] =
try Some(UnsafeNumbers.bigInteger(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand All @@ -71,10 +68,7 @@ object SafeNumbers {
try DoubleSome(UnsafeNumbers.double(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => DoubleNone }

def bigDecimal(
num: String,
max_bits: Int = 128
): Option[java.math.BigDecimal] =
def bigDecimal(num: String, max_bits: Int = 128): Option[java.math.BigDecimal] =
try Some(UnsafeNumbers.bigDecimal(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ object SafeNumbers {
try LongSome(UnsafeNumbers.long(num))
catch { case _: UnexpectedEnd | UnsafeNumber => LongNone }

def bigInteger(
num: String,
max_bits: Int = 128
): Option[java.math.BigInteger] =
def bigInteger(num: String, max_bits: Int = 128): Option[java.math.BigInteger] =
try Some(UnsafeNumbers.bigInteger(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand All @@ -71,10 +68,7 @@ object SafeNumbers {
try DoubleSome(UnsafeNumbers.double(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => DoubleNone }

def bigDecimal(
num: String,
max_bits: Int = 128
): Option[java.math.BigDecimal] =
def bigDecimal(num: String, max_bits: Int = 128): Option[java.math.BigDecimal] =
try Some(UnsafeNumbers.bigDecimal(num, max_bits))
catch { case _: UnexpectedEnd | UnsafeNumber => None }

Expand Down
27 changes: 5 additions & 22 deletions zio-json/shared/src/main/scala/zio/json/internal/lexer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,13 @@ object Lexer {
// messages) by only checking for what we expect to see (Jon Pretty's idea).
//
// returns the index of the matched field, or -1
def field(
trace: List[JsonError],
in: OneCharReader,
matrix: StringMatrix
): Int = {
def field(trace: List[JsonError], in: OneCharReader, matrix: StringMatrix): Int = {
val f = enumeration(trace, in, matrix)
char(trace, in, ':')
f
}

def enumeration(
trace: List[JsonError],
in: OneCharReader,
matrix: StringMatrix
): Int = {
def enumeration(trace: List[JsonError], in: OneCharReader, matrix: StringMatrix): Int = {
var c = in.nextNonWhitespace()
if (c != '"') error("'\"'", c, trace)
var bs = matrix.initial
Expand Down Expand Up @@ -181,10 +173,7 @@ object Lexer {
}

// useful for embedded documents, e.g. CSV contained inside JSON
def streamingString(
trace: List[JsonError],
in: OneCharReader
): java.io.Reader = {
def streamingString(trace: List[JsonError], in: OneCharReader): java.io.Reader = {
char(trace, in, '"')
new OneCharReader {
def close(): Unit = in.close()
Expand Down Expand Up @@ -346,10 +335,7 @@ object Lexer {
case UnsafeNumbers.UnsafeNumber => error("expected a Long", trace)
}

def bigInteger(
trace: List[JsonError],
in: RetractReader
): java.math.BigInteger =
def bigInteger(trace: List[JsonError], in: RetractReader): java.math.BigInteger =
try {
val i = UnsafeNumbers.bigInteger_(in, false, NumberMaxBits)
in.retract()
Expand All @@ -376,10 +362,7 @@ object Lexer {
case UnsafeNumbers.UnsafeNumber => error("expected a Double", trace)
}

def bigDecimal(
trace: List[JsonError],
in: RetractReader
): java.math.BigDecimal =
def bigDecimal(trace: List[JsonError], in: RetractReader): java.math.BigDecimal =
try {
val i = UnsafeNumbers.bigDecimal_(in, false, NumberMaxBits)
in.retract()
Expand Down

0 comments on commit 88e4a06

Please sign in to comment.