fixup! Fix Bug with valueLength being overwritten after Trim

- update check to captureValueLength in base parser if it's a complex element
- update shouldCaptureParseValueLength to use PrimType.String instead of representation Text, since strings valueLengths (and delimited valueLengths) are always handled by value parsers

DAFFODIL-2658

Author: olabusayoT

daffodil-core/src/main/scala/org/apache/daffodil/core/runtime1/ElementBaseRuntime1Mixin.scala

@@ -24,9 +24,9 @@ import org.apache.daffodil.core.dsom.PrimitiveType
 import org.apache.daffodil.core.dsom.Root
 import org.apache.daffodil.core.dsom.SimpleTypeDefBase
 import org.apache.daffodil.lib.schema.annotation.props.gen.LengthKind
-import org.apache.daffodil.lib.schema.annotation.props.gen.Representation
 import org.apache.daffodil.lib.util.Delay
 import org.apache.daffodil.lib.util.Maybe
+import org.apache.daffodil.runtime1.dpath.NodeInfo.PrimType
 import org.apache.daffodil.runtime1.dsom.DPathElementCompileInfo
 import org.apache.daffodil.runtime1.processors.ElementRuntimeData
 import org.apache.daffodil.runtime1.processors.RuntimeData
@@ -89,17 +89,19 @@ trait ElementBaseRuntime1Mixin { self: ElementBase =>
     //
     // For complex elements with specified length, value length is captured in
     // the specified length parsers, since they handle skipping unused
-    // element regions. For complex elements, this means lengthKind is not
+    // element regions, and the length capturing has to be done before that.
+    // For complex elements, this means lengthKind is not
     // implicit or delimited.
     //
     // So for these cases we do not want to capture value length with the
     // Capture{Start,End}OfValueLengthParsers, since those lengths are captured
     // by the value parsers
-    val capturedByParsers =
-      (isSimpleType && (impliedRepresentation == Representation.Text || lengthKind == LengthKind.Delimited)) ||
+    val capturedByValueParsers =
+      (isSimpleType && (
+        primType == PrimType.String || lengthKind == LengthKind.Delimited)) ||
         (isComplexType && (lengthKind != LengthKind.Implicit && lengthKind != LengthKind.Delimited))
 
-    !capturedByParsers && isReferenced
+    !capturedByValueParsers && isReferenced
   }
 
   /**

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/parsers/SpecifiedLengthParsers.scala

@@ -85,8 +85,8 @@ sealed abstract class SpecifiedLengthParserBase(eParser: Parser, erd: RuntimeDat
     if (pState.processorStatus ne Success) return
     val finalEndPos0b = startingBitPos0b + nBits
 
-    // if we haven't already set the value length, set it now
-    if (pState.infoset.valueLength.isEndUndef)
+    // we want to capture the length before we do any skipping
+    if (pState.infoset.isComplex)
       captureValueLength(pState, ULong(startingBitPos0b), ULong(dis.bitPos0b))
 
     Assert.invariant(dis eq pState.dataInputStream)

daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PrefixedTests.tdml

@@ -17,14 +17,14 @@
 -->
 
 <tdml:testSuite suiteName="PrefixedTests"
-                description="Section 12 - lengthKind=prefixed" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:fn="http://www.w3.org/2005/xpath-functions"
-                xmlns:ex="http://example.com"
-                xmlns:tns="http://example.com"
-                xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
-                defaultRoundTrip="onePass" xmlns:x="http://www.ogf.org/dfdl/dfdl-1.0/">
+  description="Section 12 - lengthKind=prefixed" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:fn="http://www.w3.org/2005/xpath-functions"
+  xmlns:ex="http://example.com"
+  xmlns:tns="http://example.com"
+  xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
+  defaultRoundTrip="onePass" xmlns:x="http://www.ogf.org/dfdl/dfdl-1.0/">
 
   <tdml:defineSchema name="lengthKindPrefixed-text.dfdl.xsd">