mbeckerle commented on a change in pull request #366: Converted many
pass-by-name into pass-by-value for RuntimeData struct…
URL: https://github.com/apache/incubator-daffodil/pull/366#discussion_r410744847
##########
File path:
daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/RuntimeData.scala
##########
@@ -224,75 +198,36 @@ sealed class NonTermRuntimeData(
object UseNilForDefault
final class SimpleTypeRuntimeData(
- @TransientParam variableMapArg: => VariableMap,
- @TransientParam schemaFileLocationArg: => SchemaFileLocation,
- @TransientParam diagnosticDebugNameArg: => String,
- @TransientParam pathArg: => String,
- @TransientParam namespacesArg: => NamespaceBinding,
- @TransientParam primTypeArg: => NodeInfo.PrimType,
- @TransientParam noFacetChecksArg: => Boolean,
- @TransientParam patternValuesArg: => Seq[FacetTypes.FacetValueR],
- @TransientParam enumerationValuesArg: => Option[String],
- @TransientParam minLengthArg: => Option[java.math.BigDecimal],
- @TransientParam maxLengthArg: => Option[java.math.BigDecimal],
- @TransientParam minInclusiveArg: => Option[java.math.BigDecimal],
- @TransientParam maxInclusiveArg: => Option[java.math.BigDecimal],
- @TransientParam minExclusiveArg: => Option[java.math.BigDecimal],
- @TransientParam maxExclusiveArg: => Option[java.math.BigDecimal],
- @TransientParam totalDigitsArg: => Option[java.math.BigDecimal],
- @TransientParam fractionDigitsArg: => Option[java.math.BigDecimal],
- @TransientParam unionMemberTypesArg: => Seq[SimpleTypeRuntimeData],
- @TransientParam unqualifiedPathStepPolicyArg: => UnqualifiedPathStepPolicy,
- @TransientParam repTypeRuntimeDataArg: => Option[SimpleTypeRuntimeData],
- @TransientParam repValueSetArg: => Option[RepValueSet],
- @TransientParam typeCalculatorArg: => Option[TypeCalculator],
- @TransientParam optRepPrimTypeArg: => Option[PrimType])
+ variableMapArg: VariableMap,
+ schemaFileLocationArg: SchemaFileLocation,
+ diagnosticDebugNameArg: String,
+ pathArg: String,
+ namespacesArg: NamespaceBinding,
+ val primType: NodeInfo.PrimType,
+ val noFacetChecks: Boolean,
+ val patternValues: Seq[FacetTypes.FacetValueR],
+ val enumerationValues: Option[String],
+ val minLength: Option[java.math.BigDecimal],
+ val maxLength: Option[java.math.BigDecimal],
+ val minInclusive: Option[java.math.BigDecimal],
+ val maxInclusive: Option[java.math.BigDecimal],
+ val minExclusive: Option[java.math.BigDecimal],
+ val maxExclusive: Option[java.math.BigDecimal],
+ val totalDigits: Option[java.math.BigDecimal],
+ val fractionDigits: Option[java.math.BigDecimal],
+ val unionMemberTypes: Seq[SimpleTypeRuntimeData],
+ unqualifiedPathStepPolicyArg: UnqualifiedPathStepPolicy,
+ val repTypeRuntimeData: Option[SimpleTypeRuntimeData],
+ val repValueSet: Option[RepValueSet],
+ val typeCalculator: Option[TypeCalculator],
+ val optRepPrimType: Option[PrimType])
extends NonTermRuntimeData(variableMapArg, schemaFileLocationArg,
diagnosticDebugNameArg,
pathArg, namespacesArg, unqualifiedPathStepPolicyArg) {
import org.apache.daffodil.util.OKOrError._
- lazy val primType = primTypeArg
- lazy val noFacetChecks = noFacetChecksArg
- lazy val patternValues = patternValuesArg
- lazy val enumerationValues = enumerationValuesArg
- lazy val minLength = minLengthArg
- lazy val maxLength = maxLengthArg
- lazy val minInclusive = minInclusiveArg
- lazy val maxInclusive = maxInclusiveArg
- lazy val minExclusive = minExclusiveArg
- lazy val maxExclusive = maxExclusiveArg
- lazy val totalDigits = totalDigitsArg
- lazy val fractionDigits = fractionDigitsArg
- lazy val unionMemberTypes = unionMemberTypesArg
- lazy val repTypeRuntimeData = repTypeRuntimeDataArg
- lazy val repValueSet = repValueSetArg
- lazy val typeCalculator = typeCalculatorArg
- lazy val optRepPrimType = optRepPrimTypeArg
-
- override def preSerialization: Unit = {
- super.preSerialization
- primType
- noFacetChecks
- patternValues
- enumerationValues
- minLength
- maxLength
- minInclusive
- maxInclusive
- minExclusive
- maxExclusive
- totalDigits
- fractionDigits
- unionMemberTypes
- repTypeRuntimeData
- repValueSet
- typeCalculator
- optRepPrimType
- }
-
- @throws(classOf[java.io.IOException])
- final private def writeObject(out: java.io.ObjectOutputStream): Unit =
serializeObject(out)
+// @throws(classOf[java.io.IOException])
Review comment:
delete commented code.
----------------------------------------------------------------
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
