mbeckerle commented on code in PR #900:
URL: https://github.com/apache/daffodil/pull/900#discussion_r1059555348
##########
daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/processors/unparsers/ConvertTextNumberUnparser.scala:
##########
@@ -43,16 +47,18 @@ case class ConvertTextCombinatorUnparser(
case class ConvertTextNumberUnparser(
Review Comment:
rename to ConvertTextStandardNumberUnparser. Rename file to correspond.
##########
daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/PrimitivesTextNumber1.scala:
##########
@@ -54,11 +56,63 @@ case class ConvertTextCombinatorParser(
}
}
+trait TextDecimalVirtualPointMixin {
+ def textDecimalVirtualPoint: Int
+
+ final protected val virtualPointScaleFactor = scala.math.pow(10.0,
textDecimalVirtualPoint)
+
+ final protected def applyTextDecimalVirtualPointForParse(num1: JNumber):
JNumber = {
+ if (textDecimalVirtualPoint == 0) num1
+ else {
+ // scale for virtual decimal point
+ val scaledNum: JNumber = num1 match {
+ // Empirically, in our test suite, we do get Long back here, so the
runtime sometimes represents small integer
+ // (or possibly even smaller decimal numbers with no fraction part) as
Long.
+ case l: JLong =>
JBigDecimal.valueOf(l).scaleByPowerOfTen(-textDecimalVirtualPoint)
+ case bd: JBigDecimal => bd.scaleByPowerOfTen(-textDecimalVirtualPoint)
+ case f: JFloat => (f / virtualPointScaleFactor).floatValue()
+ case d: JDouble => d / virtualPointScaleFactor
+ // $COVERAGE-OFF$
+ case _ => badType(num1)
+ // $COVERAGE-ON$
+ }
+ scaledNum
+ }
+ }
+
+ // $COVERAGE-OFF$
+ private def badType(num1: AnyRef) = {
+ Assert.invariantFailed(
+ s"""Number cannot be scaled for virtual decimal point,
+ |because it is not a decimal, float, or double.
+ |The type is ${num1.getClass.getSimpleName}.""".stripMargin)
+ }
+ // $COVERAGE-ON$
+
+ final protected def applyTextDecimalVirtualPointForUnparse(valueAsAnyRef:
AnyRef) : JNumber = {
+ valueAsAnyRef match {
+ // This is not perfectly symmetrical with the parse side equivalent.
+ // Empirically in our test suite, we do not see JLong here.
+ case f: JFloat => f * virtualPointScaleFactor
+ case d: JDouble => d * virtualPointScaleFactor
+ case bd: JBigDecimal => bd.scaleByPowerOfTen(textDecimalVirtualPoint)
+ case n: JNumber =>
+ if (textDecimalVirtualPoint == 0) n
+ else badType(n)
+ // $COVERAGE-OFF$
+ case _ => Assert.invariantFailed("Not a JNumber")
+ // $COVERAGE-ON$
+ }
+ }
+}
+
case class ConvertTextNumberParser(
Review Comment:
Rename to ConvertTextStandardNumberParser for consistency. The file should
also be renamed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
