pkatlic commented on code in PR #1137:
URL: https://github.com/apache/daffodil/pull/1137#discussion_r1453862824
##########
daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DState.scala:
##########
@@ -215,45 +218,26 @@ case class DState(
def booleanValue: Boolean = currentValue.getBoolean
def longValue: Long = asLong(currentValue.getAnyRef)
+
def intValue: Int = longValue.toInt
+
def doubleValue: Double = asDouble(currentValue.getAnyRef)
def integerValue: JBigInt = asBigInt(currentValue.getAnyRef)
+
def decimalValue: JBigDecimal = asBigDecimal(currentValue.getAnyRef)
+
def stringValue: String = currentValue.getString
def isNilled: Boolean = currentElement.isNilled
- private def isAnArray(): Boolean = {
- if (!currentNode.isInstanceOf[DIArray]) {
- Assert.invariant(errorOrWarn.isDefined)
- if (currentNode.isInstanceOf[DIElement]) {
- errorOrWarn.get.SDW(
- WarnID.PathNotToArray,
- "The specified path to element %s is not to an array. Suggest using
fn:exists instead.",
- currentElement.name,
- )
- } else {
- errorOrWarn.get.SDW(
- WarnID.PathNotToArray,
- "The specified path is not to an array. Suggest using fn:exists
instead.",
- )
- }
- false
- } else {
- true
- }
- }
-
def arrayLength: Long =
- if (isAnArray()) currentArray.length
- else 1L
-
- def finalArrayLength: Long =
- if (isAnArray()) {
- currentArray.requireFinal
- currentArray.length
- } else 1L
+ currentArray.length
+
+ def finalArrayLength: Long = {
+ currentArray.requireFinal()
+ currentArray.length
Review Comment:
It makes sense to separate this change (in a new PR), Mike do you have time
to pair on this in order to help identify where the change needs to occur? We
will make this PR on top of that new code. Our suspicion is that it will
require a new NodeKind.ArrayOpt.
--
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]
