This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 9e1b24a Add expressionAllowed to a few more findPropertyOption calls
9e1b24a is described below
commit 9e1b24ab7a04e9cac387d3ca14cf11eb4d8e5689
Author: --global <--global>
AuthorDate: Wed Oct 14 11:42:54 2020 -0500
Add expressionAllowed to a few more findPropertyOption calls
DAFFODIL-879
---
.../src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala | 2 +-
.../src/main/scala/org/apache/daffodil/dsom/ElementBase.scala | 4 ++--
.../src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala | 4 ++--
.../src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala | 2 +-
.../org/apache/daffodil/schema/annotation/props/ByHandMixins.scala | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
index 410d235..18fc376 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
@@ -105,7 +105,7 @@ abstract class ChoiceTermBase(
requiredEvaluationsIfActivated(branchesAreNotIVCElements)
requiredEvaluationsIfActivated(modelGroupRuntimeData.preSerialization)
- final protected lazy val optionChoiceDispatchKeyRaw =
findPropertyOption("choiceDispatchKey")
+ final protected lazy val optionChoiceDispatchKeyRaw =
findPropertyOption("choiceDispatchKey", expressionAllowed = true)
final protected lazy val choiceDispatchKeyRaw =
requireProperty(optionChoiceDispatchKeyRaw)
lazy val optionChoiceDispatchKeyKindRaw =
findPropertyOption("choiceDispatchKeyKind")
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
index 0e10d9f..e1435d9 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
@@ -91,10 +91,10 @@ trait ElementBase
override def name: String
- final lazy val inputValueCalcOption = findPropertyOption("inputValueCalc")
+ final lazy val inputValueCalcOption = findPropertyOption("inputValueCalc",
expressionAllowed = true)
final lazy val outputValueCalcOption = {
- val optOVC = findPropertyOption("outputValueCalc")
+ val optOVC = findPropertyOption("outputValueCalc", expressionAllowed =
true)
schemaDefinitionWhen(optOVC.isDefined && isOptional, "dfdl:outputValueCalc
cannot be defined on optional elements.")
schemaDefinitionWhen(optOVC.isDefined && isArray, "dfdl:outputValueCalc
cannot be defined on array elements.")
schemaDefinitionWhen(optOVC.isDefined && isComplexType,
"dfdl:outputValueCalc cannot be defined on complexType elements.")
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
index 83e177a..d122c5a 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SimpleTypes.scala
@@ -321,8 +321,8 @@ abstract class SimpleTypeDefBase(xml: Node, lexicalParent:
SchemaComponent)
}
}
- lazy val optInputTypeCalc = findPropertyOption("inputTypeCalc")
- lazy val optOutputTypeCalc = findPropertyOption("outputTypeCalc")
+ lazy val optInputTypeCalc = findPropertyOption("inputTypeCalc",
expressionAllowed = true)
+ lazy val optOutputTypeCalc = findPropertyOption("outputTypeCalc",
expressionAllowed = true)
lazy val optTypeCalculator: Option[TypeCalculator] = LV('optTypeCalculator) {
optRepType.flatMap(repType => {
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
index cc43cb7..d181b2a 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ByteOrderMixin.scala
@@ -25,7 +25,7 @@ import org.apache.daffodil.schema.annotation.props.Found
trait ByteOrderAnalysisMixin extends GrammarMixin { self: Term =>
final protected lazy val thereIsAByteOrderDefined: Boolean = {
- val byteOrdLookup = this.findPropertyOption("byteOrder")
+ val byteOrdLookup = this.findPropertyOption("byteOrder", expressionAllowed
= true)
byteOrdLookup match {
case n: NotFound => false
case f: Found => true
diff --git
a/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/ByHandMixins.scala
b/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/ByHandMixins.scala
index 04a4655..5318578 100644
---
a/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/ByHandMixins.scala
+++
b/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/ByHandMixins.scala
@@ -392,7 +392,7 @@ object BinaryBooleanFalseRepType {
trait TextStandardExponentCharacterMixin
trait TextStandardExponentRepMixin extends PropertyMixin {
- protected final lazy val optionTextStandardExponentRepRaw =
findPropertyOption("textStandardExponentRep")
+ protected final lazy val optionTextStandardExponentRepRaw =
findPropertyOption("textStandardExponentRep", expressionAllowed = true)
protected final lazy val textStandardExponentRepRaw =
requireProperty(optionTextStandardExponentRepRaw)
// Deprecated textStandardExponentCharacter
