Github user stevedlawrence commented on a diff in the pull request:
https://github.com/apache/incubator-daffodil/pull/5#discussion_r151125229
--- Diff:
daffodil-core/src/main/scala/edu/illinois/ncsa/daffodil/dsom/DFDLStatementMixin.scala
---
@@ -89,36 +156,34 @@ trait DFDLStatementMixin extends ThrowsSDE { self:
AnnotatedSchemaComponent =>
* reference.
*/
- final protected def optReferencedStatementSource:
Option[DFDLStatementMixin] =
- self.optReferredToComponent.asInstanceOf[Option[DFDLStatementMixin]]
+ final def optReferencedStatementSource:
Option[ProvidesDFDLStatementMixin] =
+
self.optReferredToComponent.asInstanceOf[Option[ProvidesDFDLStatementMixin]]
- final lazy val statements: Seq[DFDLStatement] =
- optReferencedStatementSource.toSeq.flatMap { _.statements } ++
localStatements
+ final lazy val resolvedStatements: Seq[DFDLStatement] =
+ optReferencedStatementSource.toSeq.flatMap { _.resolvedStatements } ++
localStatements
final lazy val newVariableInstanceStatements:
Seq[DFDLNewVariableInstance] =
optReferencedStatementSource.toSeq.flatMap {
_.newVariableInstanceStatements } ++
localNewVariableInstanceStatements
- final lazy val notNewVariableInstanceStatements = setVariableStatements
++ discriminatorStatements ++ assertStatements
-
final lazy val (discriminatorStatements, assertStatements) =
checkDiscriminatorsAssertsDisjoint(combinedDiscrims, combinedAsserts)
private lazy val combinedAsserts: Seq[DFDLAssert] =
- optReferencedStatementSource.toSeq.flatMap { _.assertStatements } ++
localAssertStatements
+ optReferencedStatementSource.toSeq.flatMap { _.assertStatements } ++
localassertStatements
private lazy val combinedDiscrims: Seq[DFDLDiscriminator] =
- optReferencedStatementSource.toSeq.flatMap { _.discriminatorStatements
} ++ localDiscriminatorStatements
+ optReferencedStatementSource.toSeq.flatMap { _.discriminatorStatements
} ++ localdiscriminatorStatements
--- End diff --
Did you mean to change the name of this? The camelcase before seems more
readable to me.
---
