jadams-tresys commented on a change in pull request #262: Unordered sequences
URL: https://github.com/apache/incubator-daffodil/pull/262#discussion_r318614050
##########
File path:
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceCombinator.scala
##########
@@ -76,3 +78,63 @@ class OrderedSequence(sq: SequenceTermBase,
sequenceChildrenArg: Seq[SequenceChi
}
}
}
+
+class UnorderedSequence(sq: SequenceTermBase, sequenceChildrenArg:
Seq[SequenceChild], alternatives: Seq[Gram])
+ extends SequenceCombinator(sq, sequenceChildrenArg) {
+
+ private lazy val sepGram = sq.sequenceSeparator
+ private lazy val sepParser = sepGram.parser
+ private lazy val sepUnparser = sepGram.unparser
+
+ private lazy val sequenceChildren = sequenceChildrenArg.toVector
+
+
+ private lazy val parsers = {
+ val res = alternatives.map { alt =>
+ val p = alt.parser
+ val res =
+ if (p.isEmpty)
+ new EmptyChoiceBranchParser(alt.context.runtimeData)
+ else
+ p
+ res
+ }
+ res
+ }
+
+
+ override lazy val parser: Parser = sq.hasSeparator match {
+ case true => {
+ lazy val choiceParser = new ChoiceParser(srd, sepParser +:
parsers.toVector)
+ new UnorderedSeparatedSequenceParser(
+ srd, sq.separatorPosition, sepParser,
+ choiceParser,
+ parsers.toVector)
Review comment:
I think I originally passed the childParsers along as SequenceParserBase
took a vector of child parsers, but looking back now the UnorderedSeqParsers
should just be passing the choiceParser along as the childParsers for
SequenceParserBase. Will fix
----------------------------------------------------------------
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]
With regards,
Apache Git Services
