mbeckerle commented on a change in pull request #429:
URL: https://github.com/apache/incubator-daffodil/pull/429#discussion_r499824220
##########
File path:
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceCombinator.scala
##########
@@ -98,8 +123,27 @@ class UnorderedSequence(sq: SequenceTermBase,
sequenceChildrenArg: Seq[SequenceC
import SeparatedSequenceChildBehavior._
+ private lazy val sepMtaGram = sq.delimMTA
+ // Note that we actually only every use one of these depending on depending
Review comment:
typo "every" => "ever"
##########
File path:
daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/processors/unparsers/SeparatedSequenceUnparsers.scala
##########
@@ -137,16 +142,21 @@ class OrderedSeparatedSequenceUnparser(
}
/**
- * Unparses the separator only.
+ * Unparses just the separator, as well as any mandatory text alignment if
it necessary
*
* Does not deals with infix boundary condition.
*/
private def unparseJustSeparator(state: UState): Unit = {
+ if (sepMtaUnparserMaybe.isDefined) {
Review comment:
This here is the crux of the change I think. You are laying down an
alignment unparser for the separator, only if the optimizer has decided one
could be needed, and it is laid down unconditionally. Probably worth inserting
comment to that affect here.
##########
File path:
daffodil-runtime1/src/main/scala/org/apache/daffodil/infoset/InfosetImpl.scala
##########
@@ -443,7 +443,7 @@ sealed abstract class LengthState(ie: DIElement)
def isEndUndef = {
val r = maybeEndPos0bInBits.isEmpty
- if (r) Assert.invariant(maybeStartDataOutputStream.isEmpty)
+ if (r) Assert.invariant(maybeEndDataOutputStream.isEmpty)
Review comment:
Is this just a bug fix? Was this being called?
##########
File path:
daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/processors/unparsers/SeparatedSequenceUnparsers.scala
##########
@@ -155,7 +165,7 @@ class OrderedSeparatedSequenceUnparser(
state: UState,
trailingSuspendedOps:
Buffer[SuppressableSeparatorUnparserSuspendableOperation]): Unit = {
- val suspendableOp = new
SuppressableSeparatorUnparserSuspendableOperation(sep, trd)
+ val suspendableOp = new
SuppressableSeparatorUnparserSuspendableOperation(sepMtaAlignmentMaybe, sep,
trd)
Review comment:
I'm seeing a coverage warning on this line also. Definitely need to see
this exercised to be sure the SupressableSeparatorUnparserSuspendableOperation
is being tested. Not sure why it wouldn't have been.
##########
File path:
daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/processors/unparsers/SequenceUnparserBases.scala
##########
@@ -38,5 +38,5 @@ abstract class OrderedSequenceUnparserBase(
// Since some of the grammar terms might have folded away to EmptyGram,
// the number of unparsers here may be different from the number of
// children of the sequence group.
- Assert.invariant(srd.groupMembers.length >= childUnparsers.length - 1) //
minus 1 for the separator unparser
+ //Assert.invariant(srd.groupMembers.length >= childUnparsers.length - 1) //
minus 1 for the separator unparser
Review comment:
Delete. With the comment above. I think this is not worth checking. It's
not obvious what the number of unparsers always is.
##########
File path:
daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/Parser.scala
##########
@@ -64,6 +64,17 @@ sealed trait Parser
protected def parse(pstate: PState): Unit
final def parse1(pstate: PState) = {
+ if (!isInitialized) {
+ println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
Review comment:
debug code? remove.
##########
File path:
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceCombinator.scala
##########
@@ -98,8 +123,27 @@ class UnorderedSequence(sq: SequenceTermBase,
sequenceChildrenArg: Seq[SequenceC
import SeparatedSequenceChildBehavior._
+ private lazy val sepMtaGram = sq.delimMTA
+ // Note that we actually only every use one of these depending on depending
+ // on various factors. If there is an optional separtor and a suspension is
+ // used to unaprse that separator, then we cannot use the sepMtaUnaprser
+ // because it results in nested suspensions, which isn't allowed. In that
+ // case, the suspension ends up handling both the optional separator and
+ // alignment using sepMtaAlignmentMaybe.
+ private lazy val (sepMtaAlignmentMaybe, sepMtaUnparserMaybe) =
+ if (sepMtaGram.isEmpty) {
+ (MaybeInt.Nope, Maybe.Nope)
+ } else {
+ (MaybeInt(sq.knownEncodingAlignmentInBits), Maybe(sepMtaGram.unparser))
Review comment:
I think we need a test where the separator requires alignment, but ZL
happens and the alignment and separator are both suppressed. A BCD number odd
number of nibbles long, separated by DEL (0x7F) characters would do it.
##########
File path:
daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/SuspensionTracker.scala
##########
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.daffodil.processors
+
+import scala.collection.mutable.Queue
+
+import org.apache.daffodil.dsom.RuntimeSchemaDefinitionError
+import org.apache.daffodil.exceptions.Assert
+
+class SuspensionTracker {
+
+ private val suspensionsYoung = new Queue[Suspension]
+ private val suspensionsOld = new Queue[Suspension]
+
+ private val suspensionWaitYoung = 5
+ private val suspensionWaitOld = 100
+
+ private var count: Int = 0
+
+ def trackSuspension(s: Suspension): Unit = {
+ suspensionsYoung.enqueue(s)
+ }
+
+ /**
+ * Attempts to evaluate suspensions. Old suspensions are evaluated less
+ * frequently than young suspensions. Any young suspensions that fail to
+ * evaluate are moved to the old suspensions list. If we evaluate old
+ * suspensions, we attempt to evaluate them first, with the hope that their
+ * resolution might make the young suspensions more likely to evaluate.
+ */
+ def evalSuspensions(): Unit = {
+ if (count % suspensionWaitOld == 0) {
+ evalSuspensionQueue(suspensionsOld)
+ }
+ if (count % suspensionWaitYoung == 0) {
+ evalSuspensionQueue(suspensionsYoung)
+ while (suspensionsYoung.nonEmpty) {
+ suspensionsOld.enqueue(suspensionsYoung.dequeue)
+ }
+ }
+
+ if (count == suspensionWaitOld) {
+ count = 0
+ } else {
+ count += 1
+ }
+ }
+
+ /**
+ * Evaluates all suspensions until either they are all evaluated or a
+ * deadlock is detected. This moves all young suspensions to the old queue,
+ * and evaluates all old suspensions. If the old queue is non-empty, that
+ * means some suspensions are blocked, likely due to a circular deadlock, and
+ * we output diagnostics.
+ */
+ def requireFinal(): Unit = {
+ while (suspensionsYoung.nonEmpty) {
+ suspensionsOld.enqueue(suspensionsYoung.dequeue)
+ }
+
+ evalSuspensionQueue(suspensionsOld)
+
+ if (suspensionsOld.length == 1) {
+ Assert.invariantFailed("Single suspended expression making no forward
progress. " + suspensionsOld(0))
Review comment:
Actually if you change this to Assert.invariant(suspensionsOld.length !=
1, "Single suspended expression ...") then that would fix the code-cov warning
I'm seeing.
----------------------------------------------------------------
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]
