stevedlawrence commented on a change in pull request #74: Daffodil trailing sep
URL: https://github.com/apache/incubator-daffodil/pull/74#discussion_r195073545
##########
File path:
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/LayeredSequence.scala
##########
@@ -21,23 +21,29 @@ import org.apache.daffodil.grammar.Terminal
import org.apache.daffodil.dsom._
import org.apache.daffodil.processors.parsers.{ Parser => DaffodilParser }
import org.apache.daffodil.processors.unparsers.{ Unparser => DaffodilUnparser
}
-import org.apache.daffodil.grammar.Gram
import org.apache.daffodil.util.Misc
import org.apache.daffodil.processors.parsers.LayeredSequenceParser
import org.apache.daffodil.processors.unparsers.LayeredSequenceUnparser
+import
org.apache.daffodil.processors.parsers.ScalarOrderedRequiredUnseparatedSequenceChildParser
+import
org.apache.daffodil.processors.unparsers.ScalarOrderedRequiredUnseparatedSequenceChildUnparser
-case class LayeredSequence(sq: SequenceTermBase, bodyTerm: Gram)
+case class LayeredSequence(sq: SequenceTermBase, bodyTerm: SequenceChild)
extends Terminal(sq, true) {
+ private val srd = sq.sequenceRuntimeData
+ private val trd = bodyTerm.trd
+
override def toString() =
"<" + Misc.getNameFromClass(this) + ">" +
bodyTerm.toString() +
"</" + Misc.getNameFromClass(this) + ">"
override lazy val parser: DaffodilParser =
- new LayeredSequenceParser(sq.termRuntimeData,
sq.maybeLayerTransformerEv.get, bodyTerm.parser)
+ new LayeredSequenceParser(srd, sq.maybeLayerTransformerEv.get,
+ new ScalarOrderedRequiredUnseparatedSequenceChildParser(bodyTerm.parser,
srd, trd))
override lazy val unparser: DaffodilUnparser = {
- new LayeredSequenceUnparser(sq.modelGroupRuntimeData,
sq.maybeLayerTransformerEv.get, bodyTerm.unparser)
+ new LayeredSequenceUnparser(sq.sequenceRuntimeData,
sq.maybeLayerTransformerEv.get,
Review comment:
Can you use srd like above?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
