mbeckerle commented on a change in pull request #473:
URL: https://github.com/apache/incubator-daffodil/pull/473#discussion_r562133076
##########
File path:
daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/processors/unparsers/ExpressionEvaluatingUnparsers.scala
##########
@@ -77,30 +76,52 @@ final class SetVariableUnparser(
}
+final class NewVariableInstanceSuspendableExpression(
+ override val expr: CompiledExpression[AnyRef],
+ override val rd: VariableRuntimeData)
+ extends SuspendableExpression {
+
+ override protected def processExpressionResult(ustate: UState, v:
DataValuePrimitive): Unit = {
+ ustate.variableMap.newVariableInstance(rd, v)
+ }
+
+ override protected def maybeKnownLengthInBits(ustate: UState) = MaybeULong(0)
+}
+
// When implemented this almost certainly wants to be a combinator
// Not two separate unparsers.
-class NewVariableInstanceStartUnparser(override val context: RuntimeData)
+class NewVariableInstanceStartUnparser(override val context:
VariableRuntimeData)
extends PrimUnparserNoData {
override lazy val runtimeDependencies = Vector()
override lazy val childProcessors = Vector()
+ def suspendableExpression = {
+ Assert.invariant(context.maybeDefaultValueExpr.isDefined)
+ new
NewVariableInstanceSuspendableExpression(context.maybeDefaultValueExpr.get,
context)
+ }
+
override def unparse(state: UState) = {
- val vrd = context.asInstanceOf[VariableRuntimeData]
- state.newVariableInstance(vrd)
+ if (context.maybeDefaultValueExpr.isDefined) {
+ suspendableExpression.run(state)
+ }
+ else {
+ state.variableMap.newVariableInstance(context)
+ }
}
}
-class NewVariableInstanceEndUnparser(override val context: RuntimeData)
+class NewVariableInstanceEndUnparser(override val context: VariableRuntimeData)
extends PrimUnparserNoData {
override lazy val runtimeDependencies = Vector()
override lazy val childProcessors = Vector()
override def unparse(state: UState) = {
- state.removeVariableInstance(context.asInstanceOf[VariableRuntimeData])
+ if (state.variableMap.find(context.globalQName).isDefined)
Review comment:
I think SL is correct. This isn't right. We can't suspend creation of
the variable instance, we have to suspend the calculation of its value
sometimes, and we can't read it until that calculation is complete, but the
instance has to be there so that the expressions can try to read and determine
that they've blocked on a pending variable value.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
