Skip to content

Fix float/double facet checks to use native comparison instead of compareTo #1664

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

Open
gdesrosiers1805 wants to merge 1 commit into
base: main
Choose a base branch
from
+805 −10
Open

Fix float/double facet checks to use native comparison instead of compareTo #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,12 @@ final class SimpleTypeRuntimeData(
): Boolean = {
// we must handle float and double separately because diNode.dataValue
// could be Inf/Nan, which cannot be converted to BigDecimal
// we must also use native float/double comparison, not compareTo. Float|Double.compareTo
// define +0.0f|d > -0.0f|d (total order) and NaN > all values, but XSD requires math
// equality (-0.0 == +0.0) and NaN incomparable (fails all facets).
diNode.dataValue.getAnyRef match {
case f: JFloat => f.compareTo(minValue.floatValue) >= 0
case d: JDouble => d.compareTo(minValue.doubleValue) >= 0
case f: JFloat => f >= minValue.floatValue
case d: JDouble => d >= minValue.doubleValue
case _ => diNode.dataValueAsBigDecimal.compareTo(minValue) >= 0
}
}
Expand All @@ -537,9 +540,12 @@ final class SimpleTypeRuntimeData(
): Boolean = {
// we must handle float and double separately because diNode.dataValue
// could be Inf/Nan, which cannot be converted to BigDecimal
// we must also use native float/double comparison, not compareTo. Float|Double.compareTo
// define +0.0f|d > -0.0f|d (total order) and NaN > all values, but XSD requires math
// equality (-0.0 == +0.0) and NaN incomparable (fails all facets).
diNode.dataValue.getAnyRef match {
case f: JFloat => f.compareTo(minValue.floatValue) > 0
case d: JDouble => d.compareTo(minValue.doubleValue) > 0
case f: JFloat => f > minValue.floatValue
case d: JDouble => d > minValue.doubleValue
case _ => diNode.dataValueAsBigDecimal.compareTo(minValue) > 0
}
}
Expand All @@ -552,9 +558,12 @@ final class SimpleTypeRuntimeData(
): Boolean = {
// we must handle float and double separately because diNode.dataValue
// could be Inf/Nan, which cannot be converted to BigDecimal
// we must also use native float/double comparison, not compareTo. Float|Double.compareTo
// define +0.0f|d > -0.0f|d (total order) and NaN > all values, but XSD requires math
// equality (-0.0 == +0.0) and NaN incomparable (fails all facets).
diNode.dataValue.getAnyRef match {
case f: JFloat => f.compareTo(maxValue.floatValue) <= 0
case d: JDouble => d.compareTo(maxValue.doubleValue) <= 0
case f: JFloat => f <= maxValue.floatValue
case d: JDouble => d <= maxValue.doubleValue
case _ => diNode.dataValueAsBigDecimal.compareTo(maxValue) <= 0
}
}
Expand All @@ -567,9 +576,12 @@ final class SimpleTypeRuntimeData(
): Boolean = {
// we must handle float and double separately because diNode.dataValue
// could be Inf/Nan, which cannot be converted to BigDecimal
// we must also use native float/double comparison, not compareTo. Float|Double.compareTo
// define +0.0f|d > -0.0f|d (total order) and NaN > all values, but XSD requires math
// equality (-0.0 == +0.0) and NaN incomparable (fails all facets).
diNode.dataValue.getAnyRef match {
case f: JFloat => f.compareTo(maxValue.floatValue) < 0
case d: JDouble => d.compareTo(maxValue.doubleValue) < 0
case f: JFloat => f < maxValue.floatValue
case d: JDouble => d < maxValue.doubleValue
case _ => diNode.dataValueAsBigDecimal.compareTo(maxValue) < 0
}
}
Expand Down
Loading