mbeckerle commented on a change in pull request #88: Daffodil 1919 separators
URL: https://github.com/apache/incubator-daffodil/pull/88#discussion_r206560640
##########
File path:
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/ElementCombinator.scala
##########
@@ -431,50 +430,53 @@ abstract class ElementCombinatorBase(context:
ElementBase, eGramBefore: Gram, eG
if (pd.size == 0) {
Maybe.Nope
} else {
- Maybe(pd(0).gram.parser)
+ pd(0).gram(context).maybeParser
}
}
- lazy val patAssert = context.assertStatements.filter(_.testKind ==
TestKind.Pattern).map(_.gram.parser).toArray
- lazy val pSetVar = context.setVariableStatements.map(_.gram.parser).toArray
+ lazy val patAssert = context.assertStatements.filter(_.testKind ==
TestKind.Pattern).map(_.gram(context).parser).toArray
+ lazy val pSetVar =
context.setVariableStatements.map(_.gram(context).parser).toArray
lazy val testDiscrim = {
val td = context.discriminatorStatements.filter(_.testKind ==
TestKind.Expression)
Assert.invariant(td.size <= 1)
if (td.size == 0) {
Maybe.Nope
} else {
- Maybe(td(0).gram.parser)
+ td(0).gram(context).maybeParser
}
}
- lazy val testAssert = context.assertStatements.filter(_.testKind ==
TestKind.Expression).map(_.gram.parser).toArray
+ lazy val testAssert = context.assertStatements.filter(_.testKind ==
TestKind.Expression).map(_.gram(context).parser).toArray
- lazy val eBeforeParser: Maybe[Parser] =
- if (eGramBefore.isEmpty) Maybe.Nope
- else Maybe(eGramBefore.parser)
+ lazy val eBeforeParser: Maybe[Parser] = eGramBefore.maybeParser
- lazy val eParser: Maybe[Parser] =
- if (eGram.isEmpty) Maybe.Nope
- else Maybe(eGram.parser)
+ lazy val eParser: Maybe[Parser] = eGram.maybeParser
- lazy val eAfterParser: Maybe[Parser] =
- if (eGramAfter.isEmpty) Maybe.Nope
- else Maybe(eGramAfter.parser)
+ lazy val eAfterParser: Maybe[Parser] = eGramAfter.maybeParser
def parser: Parser
- lazy val uSetVar = context.setVariableStatements.map(_.gram.unparser).toArray
+ lazy val uSetVar =
context.setVariableStatements.map(_.gram(context).unparser).toArray
- lazy val eBeforeUnparser: Maybe[Unparser] =
- if (eGramBefore.isEmpty) Maybe.Nope
- else Maybe(eGramBefore.unparser)
+ lazy val eBeforeUnparser: Maybe[Unparser] = eGramBefore.maybeUnparser
- lazy val eUnparser: Maybe[Unparser] =
- if (eGram.isEmpty) Maybe.Nope
- else Maybe(eGram.unparser)
+ lazy val eUnparser: Maybe[Unparser] = eGram.maybeUnparser
- lazy val eAfterUnparser: Maybe[Unparser] =
- if (eGramAfter.isEmpty) Maybe.Nope
- else Maybe(eGramAfter.unparser)
+ lazy val eAfterUnparser: Maybe[Unparser] = eGramAfter.maybeUnparser
def unparser: Unparser
}
+
+//
Review comment:
delete
----------------------------------------------------------------
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
