Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parse all edge cases of ints and floats #315

Merged
merged 3 commits into from
Jul 17, 2024
Merged

parse all edge cases of ints and floats #315

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc1dd26
parse all edge cases of ints and floats
lbialy Jul 16, 2024
5eed294
use scala 2.13 syntax for cross-compile
lbialy Jul 16, 2024
dcecaa3
decided to disregard the lowercase problem
lbialy Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 46 additions & 7 deletions core/shared/src/main/scala/org/virtuslab/yaml/YamlDecoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,27 +85,66 @@ object YamlDecoder extends YamlDecoderCompanionCrossCompat {
)

implicit def forInt: YamlDecoder[Int] = YamlDecoder { case s @ ScalarNode(value, _) =>
Try(java.lang.Integer.decode(value.replaceAll("_", "")).toInt).toEither.left
val normalizedValue =
if (value.startsWith("0o")) value.stripPrefix("0o").prepended('0') else value

Try(java.lang.Integer.decode(normalizedValue.replaceAll("_", "")).toInt).toEither.left
.map(ConstructError.from(_, "Int", s))
}

implicit def forLong: YamlDecoder[Long] = YamlDecoder { case s @ ScalarNode(value, _) =>
Try(java.lang.Long.decode(value.replaceAll("_", "")).toLong).toEither.left
val normalizedValue =
if (value.startsWith("0o")) value.stripPrefix("0o").prepended('0') else value

Try(java.lang.Long.decode(normalizedValue.replaceAll("_", "")).toLong).toEither.left
.map(ConstructError.from(_, "Long", s))
}

private val infinityRegex = """([-+]?)(\.inf|\.Inf|\.INF)""".r
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a regex? toLowerCase.endsWith etc. wouldn't be enough here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

according to spec .INf is not a validInfinity :[

also it would be something like:

if value.nonEmpty then
  if value(0) == '-' then
    if value(1) == '.' then
      if value(2) == 'i' || value(2) == 'I' ...

which is basically the same thing as what regex would do.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok sure, that was just a nitpick


private val nanRegex = """(\.nan|\.NaN|\.NAN)""".r

implicit def forDouble: YamlDecoder[Double] = YamlDecoder { case s @ ScalarNode(value, _) =>
Try(java.lang.Double.parseDouble(value.replaceAll("_", ""))).toEither.left
.map(ConstructError.from(_, "Double", s))
infinityRegex.findFirstMatchIn(value) match {
case Some(m) =>
Right(m.group(1) match {
case "-" => Double.NegativeInfinity
case _ => Double.PositiveInfinity
})
case None =>
nanRegex.findFirstMatchIn(value) match {
case Some(_) =>
Right(Double.NaN)
case None =>
Try(java.lang.Double.parseDouble(value.replaceAll("_", ""))).toEither.left
.map(ConstructError.from(_, "Double", s))
}
}
}

implicit def forFloat: YamlDecoder[Float] = YamlDecoder { case s @ ScalarNode(value, _) =>
Try(java.lang.Float.parseFloat(value.replaceAll("_", ""))).toEither.left
.map(ConstructError.from(_, "Float", s))
infinityRegex.findFirstMatchIn(value) match {
case Some(m) =>
Right(m.group(1) match {
case "-" => Float.NegativeInfinity
case _ => Float.PositiveInfinity
})
case None =>
nanRegex.findFirstMatchIn(value) match {
case Some(_) =>
Right(Float.NaN)
case None =>
Try(java.lang.Float.parseFloat(value.replaceAll("_", ""))).toEither.left
.map(ConstructError.from(_, "Float", s))
}
}
}

implicit def forShort: YamlDecoder[Short] = YamlDecoder { case s @ ScalarNode(value, _) =>
Try(java.lang.Short.decode(value.replaceAll("_", "")).toShort).toEither.left
val normalizedValue =
if (value.startsWith("0o")) value.stripPrefix("0o").prepended('0') else value

Try(java.lang.Short.decode(normalizedValue.replaceAll("_", "")).toShort).toEither.left
.map(ConstructError.from(_, "Short", s))
}

Expand Down
54 changes: 54 additions & 0 deletions core/shared/src/test/scala-3/org/virtuslab/yaml/decoder/DecoderSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,60 @@ class DecoderSuite extends munit.FunSuite:
assertEquals(foo, Right(List(Some(Foo(1, "1")), None)))
}

test("issue 222 - parse edge cases of booleans floats doubles and integers") {
case class Data(
booleans: List[Boolean],
integers: List[Int],
floats: List[Float],
`also floats`: List[Float],
`also doubles`: List[Double]
) derives YamlCodec

val yaml = """booleans: [ true, True, false, FALSE ]
|integers: [ 0, 0o7, 0x3A, -19 ]
|floats: [
| 0., -0.0, .5, +12e03, -2E+05 ]
|also floats: [
| .inf, -.Inf, +.INF, .NAN, .nan, .NaN]
|also doubles: [
| .inf, -.Inf, +.INF, .NAN, .nan, .NaN]""".stripMargin

val expected = Data(
booleans = List(true, true, false, false),
integers = List(0, 7, 58, -19),
floats = List(0.0f, -0.0f, 0.5f, 12000.0f, -200000.0f),
`also floats` = List(
Float.PositiveInfinity,
Float.NegativeInfinity,
Float.PositiveInfinity,
Float.NaN,
Float.NaN,
Float.NaN
),
`also doubles` = List(
Double.PositiveInfinity,
Double.NegativeInfinity,
Double.PositiveInfinity,
Double.NaN,
Double.NaN,
Double.NaN
)
)

yaml.as[Data] match
case Left(error: YamlError) => throw error
case Right(data) =>
assertEquals(data.booleans, expected.booleans)
assertEquals(data.integers, expected.integers)
assertEquals(data.floats, expected.floats)
data.`also floats`.zipAll(expected.`also floats`, 0f, 0f).foreach { case (a, b) =>
assertEqualsFloat(a, b, 0f)
}
data.`also doubles`.zipAll(expected.`also doubles`, 0.0d, 0.0d).foreach { case (a, b) =>
assertEqualsDouble(a, b, 0.0d)
}
}

test("issue 281 - parse multiline string") {
case class Data(description: String) derives YamlCodec

Expand Down