You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2022/01/24 19:15:06 UTC

[daffodil] branch main updated: Use setVariable value expression to get referenced elements

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git


The following commit(s) were added to refs/heads/main by this push:
     new 2e420f4  Use setVariable value expression to get referenced elements
2e420f4 is described below

commit 2e420f43199d878ba4f18a03b374bf37255d472d
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Mon Jan 24 12:56:51 2022 -0500

    Use setVariable value expression to get referenced elements
    
    When trying to calculcate which elements are referenced via
    dfdl:setVariable expressions, which is used for things like value and
    content length, we incorectly used the default expression associated
    with the dfdl:defineDariable instead of the actual value expression of
    the dfdl:setVariable. This modifies the logic to use the correct
    expression.
    
    DAFFODIL-2629
---
 .../main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala   | 7 ++-----
 .../apache/daffodil/section07/variables/setVarWIthValueLength.tdml | 4 ++--
 .../daffodil/section07/variables/TestSetVarWithValueLength.scala   | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
index f3d2d4e..11e2482 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLStatementMixin.scala
@@ -52,11 +52,8 @@ trait ResolvesDFDLStatementMixin
     f: ContentValueReferencedElementInfoMixin => Set[DPathElementCompileInfo]) = {
     s match {
       case sv: DFDLSetVariable => {
-        val mdv = sv.defv.maybeDefaultValueExpr
-        if (mdv.isDefined)
-          f(mdv.get)
-        else
-          ReferencedElementInfos.None
+        val v = sv.gram(self).expr
+        f(v)
       }
       case nv: DFDLNewVariableInstance => {
         val mdv = nv.maybeDefaultValueExpr
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
index 853c728..fe489a8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
@@ -96,7 +96,7 @@
     <infoset>
       <dfdlInfoset>
         <f:root>
-          <message>0</message>
+          <someElement>0</someElement>
         </f:root>
       </dfdlInfoset>
     </infoset>
@@ -111,7 +111,7 @@
     <infoset>
       <dfdlInfoset>
         <f:root2>
-          <message>0</message>
+          <someElement>0</someElement>
         </f:root2>
       </dfdlInfoset>
     </infoset>
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section07/variables/TestSetVarWithValueLength.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section07/variables/TestSetVarWithValueLength.scala
index a2b7d2b..0897cba 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section07/variables/TestSetVarWithValueLength.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section07/variables/TestSetVarWithValueLength.scala
@@ -34,11 +34,10 @@ object TestSetVarWithValueLength {
 class TestSetVarWithValueLength {
 
   import TestSetVarWithValueLength._
-  @Test def dummyTest(): Unit = { val r = runner ; () } // prevents tools from auto-removing the imports
 
   // DAFFODIL-2629 Runtime SDE
-  // @Test def testSetVarWithValueLength1() = { runner.runOneTest("setVarWithValueLength1") }
-  // @Test def testSetVarWithValueLength2() = { runner.runOneTest("setVarWithValueLength2") }
+  @Test def testSetVarWithValueLength1() = { runner.runOneTest("setVarWithValueLength1") }
+  @Test def testSetVarWithValueLength2() = { runner.runOneTest("setVarWithValueLength2") }
 
 
 }