You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2019/06/17 18:33:16 UTC
[incubator-daffodil] branch master updated: Warn when DFDL
properties are ignored
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 d4ec7d9 Warn when DFDL properties are ignored
d4ec7d9 is described below
commit d4ec7d9dd99ca163d8403c0b99770006aaba379b
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jun 13 09:40:38 2019 -0400
Warn when DFDL properties are ignored
During schema compilation, a cache of properties exists to speed up
subsequent property lookups. This patch takes advantage of that cache to
determine which properties have been used or not. At the end of schema
compilation, we now inspect all Terms and look for any properties that
are defined on each Term but are not in the cache, which implies that a
property was not used and we can create an SDW. These warnings should
help schema developers realize when properties are accidentally ignored
(e.g. dfdl:lengthPattern is defined but dfdl:lengthKind is not "pattern").
Additionally, lookup functions were refactored to ensure properties are
always cached. Some parts of the code would skip caching if it used
findPropertyOption or other functions instead of cachePropertyOption. To
avoid accidentally not adding a lookup to the cache, the cache*
functions are removed, the findPropertyOption always caches, and all
property lookups are changed to use this function or a wrapper.
Also modify all tests to remove unused properties unless explicitly
testing that a property is ignored.
DAFFODIL-1619
---
.../org/apache/daffodil/compiler/Compiler.scala | 12 +-
.../daffodil/dsom/AnnotatedSchemaComponent.scala | 131 ++++++++++++---------
.../apache/daffodil/dsom/DFDLEscapeScheme.scala | 2 +-
.../apache/daffodil/dsom/GlobalElementDecl.scala | 5 +-
.../scala/org/apache/daffodil/dsom/GroupDef.scala | 5 +-
.../org/apache/daffodil/dsom/SequenceGroup.scala | 5 +-
.../org/apache/daffodil/dsom/SimpleTypes.scala | 14 ++-
.../main/scala/org/apache/daffodil/dsom/Term.scala | 38 +++++-
.../apache/daffodil/dsom/TestInputValueCalc.scala | 2 +-
.../apache/daffodil/general/TestPrimitives.scala | 8 +-
.../annotation/props/TestPropertyRuntime.scala | 2 +-
.../schema/annotation/props/ByHandMixins.scala | 2 +-
.../schema/annotation/props/PropertyScoping.scala | 55 ++++-----
.../annotation/props/TestGeneratedProperties.scala | 2 +-
.../resources/org/apache/daffodil/xsd/dafext.xsd | 3 +-
.../daffodil/propGen/PropertyGenerator.scala | 12 +-
.../daffodil/propGen/TestPropertyGenerator.scala | 10 +-
.../ibm-contributed/alignment_bytes_12.dfdl.xsd | 1 -
.../ibm-contributed/delimiter_12.dfdl.xsd | 26 +---
.../test-suite/ibm-contributed/dpabol101.dfdl.xsd | 3 -
.../ibm-contributed/dpadelone107_05.dfdl.xsd | 2 +-
.../ibm-contributed/dpaextdeltxt101.dfdl.xsd | 4 +-
.../ibm-contributed/dpaflsaln101_01.dfdl.xsd | 12 +-
.../ibm-contributed/dpaflsenc101_04_01.dfdl.xsd | 10 +-
.../ibm-contributed/dpaflsmbyfrm41.dfdl.xsd | 4 +-
.../ibm-contributed/dpaflstrm101_03.dfdl.xsd | 3 +-
.../test-suite/ibm-contributed/dpaimptxt.dfdl.xsd | 3 +-
.../test-suite/ibm-contributed/dpaspc7131.dfdl.xsd | 7 +-
.../test-suite/ibm-contributed/dpaspc7132.dfdl.xsd | 7 +-
.../ibm-contributed/dpaspc7132_2.dfdl.xsd | 3 +-
.../ibm-contributed/length_explicit_12.dfdl.xsd | 9 +-
.../ibm-contributed/syntax_entities_6.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AF.dfdl.xsd | 12 +-
.../test-suite/tresys-contributed/AG.dfdl.xsd | 9 +-
.../test-suite/tresys-contributed/AU.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AV.dfdl.xsd | 29 ++---
.../test-suite/tresys-contributed/AW.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AX.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AY.dfdl.xsd | 4 +-
.../test-suite/tresys-contributed/AZ.dfdl.xsd | 2 +-
.../tresys-contributed/delimTests.dfdl.xsd | 2 +-
.../extensions/type_calc/typeCalcFunctions.tdml | 4 +-
.../apache/daffodil/section05/facets/Facets.tdml | 8 +-
.../daffodil/section05/simple_types/AL.dfdl.xsd | 6 +-
.../daffodil/section05/simple_types/BitOrder.tdml | 2 +-
.../section05/simple_types/SimpleTypes.tdml | 4 +-
.../daffodil/section06/entities/Entities.tdml | 2 +-
.../namespaces/address_namespace.dfdl.xsd | 2 +-
.../namespaces/address_no_namespace.dfdl.xsd | 12 +-
.../section06/namespaces/multi_A_09.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_09.dfdl.xsd | Bin 8200 -> 7630 bytes
.../external_variables/external_variables.dfdl.xsd | 10 +-
.../section07/property_syntax/PropertySyntax.tdml | 28 +++++
.../PropertiesDefined.dfdl.xsd | 2 +-
.../ContentFramingProps.tdml | 12 +-
.../section12/aligned_data/Aligned_Data.tdml | 97 ++++++++-------
.../apache/daffodil/section12/lengthKind/AI.tdml | 9 +-
.../apache/daffodil/section12/lengthKind/AN.tdml | 5 +-
.../section12/lengthKind/ExplicitTests.tdml | 2 +-
.../section12/lengthKind/PatternTests.tdml | 65 ++++------
.../apache/daffodil/section13/packed/packed.tdml | 44 +++----
.../text_number_props/TextNumberProps.tdml | 25 +++-
.../section14/sequence_groups/SequenceGroup.tdml | 9 +-
.../sequence_groups/SequenceGroupDelimiters.tdml | 3 +-
.../SequenceGroupInitiatedContent.tdml | 8 +-
.../section23/dfdl_expressions/expressions.tdml | 8 +-
.../section23/dfdl_functions/Functions.tdml | 16 +--
.../property_syntax/TestPropertySyntax.scala | 1 +
.../src/main/resources/bitorder.tutorial.tdml.xml | 2 -
69 files changed, 432 insertions(+), 432 deletions(-)
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
index e563109..e3dbfdc 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/compiler/Compiler.scala
@@ -109,6 +109,10 @@ final class ProcessorFactory(val sset: SchemaSet)
lazy val rootElem = sset.root
+ lazy val checkUnusedProperties = LV('hasUnusedProperties) {
+ rootElem.checkUnusedProperties
+ }.value
+
//
// breaking this into these lines causes the order things are
// evaluated in to be more rational than if pure demand-driven
@@ -135,8 +139,12 @@ final class ProcessorFactory(val sset: SchemaSet)
// try to compile invalid schemas.
val requiredErr = super.isError
val ssetErr = sset.isError
- val res = requiredErr || ssetErr
- res
+ val hasErrors = requiredErr || ssetErr
+ if (!hasErrors) {
+ // only check for unused properties if there are no errors
+ checkUnusedProperties
+ }
+ hasErrors
} else true
}
}
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
index 6797167..a85d2ab 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala
@@ -51,11 +51,36 @@ import org.apache.daffodil.api.WarnID
* used to generate any processor (for instance, there may be a globalSimpleType whose
* only purpose is to define a TypeCalculator for use in DPath expressions)
*/
+
+object ResolvesProperties {
+ /**
+ * List of properties that when looked up should only be found on the
+ * immediate element--properties on a reference or defaults should not be
+ * taken into account.
+ */
+ val localOnlyProperties = Seq(
+ "choiceBranchKey",
+ "hiddenGroupRef",
+ "inputTypeCalc",
+ "outputTypeCalc",
+ "repType",
+ "repValueRanges",
+ "repValues"
+ )
+}
+
trait ResolvesProperties
extends FindPropertyMixin { self: AnnotatedSchemaComponent =>
private def findNonDefaultProperty(pname: String): PropertyLookupResult = {
- val result = findDefaultOrNonDefaultProperty(pname, nonDefaultPropertySources)
+ val sources =
+ if (ResolvesProperties.localOnlyProperties.contains(pname)) {
+ Seq(nonDefaultFormatChain)
+ } else {
+ nonDefaultPropertySources
+ }
+
+ val result = findPropertyInSources(pname, sources)
result match {
case f: Found => f
case NotFound(nd, d, _) =>
@@ -65,7 +90,7 @@ trait ResolvesProperties
}
private def findDefaultProperty(pname: String): PropertyLookupResult = {
- val result = findDefaultOrNonDefaultProperty(pname, defaultPropertySources)
+ val result = findPropertyInSources(pname, defaultPropertySources)
val fixup = result match {
case Found(value, loc, pname, _) =>
// found as a default property.
@@ -78,28 +103,62 @@ trait ResolvesProperties
fixup
}
+ private def findPropertyInSources(
+ pname: String,
+ sources: Seq[ChainPropProvider]): PropertyLookupResult = {
+ //
+ // Important - use of stream here insures we don't lookup
+ // properties down the chain once we have them here.
+ //
+ val str = sources.toStream.map { _.chainFindProperty(pname) }
+ val optFound = str.collectFirst { case found: Found => found }
+ val result = optFound match {
+ case Some(f: Found) => f
+ case None => {
+ val seq = str.toSeq
+ // merge all the NotFound stuff.
+ val nonDefaults = seq.flatMap {
+ case NotFound(nd, d, _) => nd
+ case _: Found => Assert.invariantFailed()
+ }
+ val defaults = seq.flatMap {
+ case NotFound(nd, d, _) => d
+ case _: Found => Assert.invariantFailed()
+ }
+ Assert.invariant(defaults.isEmpty)
+ val nf = NotFound(nonDefaults, defaults, pname)
+ nf
+ }
+ }
+ result
+ }
+
/**
* Does lookup of property using DFDL scoping rules, checking first non-default
* properties, then default property locations.
*/
- override def findPropertyOption(pname: String): PropertyLookupResult = {
+ protected override def lookupProperty(pname: String): PropertyLookupResult = {
ExecutionMode.requireCompilerMode
// first try in regular properties
val regularResult = findNonDefaultProperty(pname)
regularResult match {
case f: Found => f
- case NotFound(nonDefaultLocsTried1, defaultLocsTried1, _) => {
- Assert.invariant(defaultLocsTried1.isEmpty)
- val defaultResult = findDefaultProperty(pname)
- defaultResult match {
- case f: Found => f
- case NotFound(nonDefaultLocsTried2, defaultLocsTried2, _) => {
- Assert.invariant(nonDefaultLocsTried2.isEmpty)
- // did not find it at all. Return a NotFound with all the places we
- // looked non-default and default.
- val nonDefaultPlaces = nonDefaultLocsTried1
- val defaultPlaces = defaultLocsTried2
- NotFound(nonDefaultPlaces, defaultPlaces, pname)
+ case nf @ NotFound(nonDefaultLocsTried1, defaultLocsTried1, _) => {
+ if (ResolvesProperties.localOnlyProperties.contains(pname)) {
+ nf
+ } else {
+ Assert.invariant(defaultLocsTried1.isEmpty)
+ val defaultResult = findDefaultProperty(pname)
+ defaultResult match {
+ case f: Found => f
+ case NotFound(nonDefaultLocsTried2, defaultLocsTried2, _) => {
+ Assert.invariant(nonDefaultLocsTried2.isEmpty)
+ // did not find it at all. Return a NotFound with all the places we
+ // looked non-default and default.
+ val nonDefaultPlaces = nonDefaultLocsTried1
+ val defaultPlaces = defaultLocsTried2
+ NotFound(nonDefaultPlaces, defaultPlaces, pname)
+ }
}
}
}
@@ -193,48 +252,6 @@ trait AnnotatedSchemaComponent
val res = schemaDocument.formatAnnotation.formatChain
res
}
-
- protected final def findDefaultOrNonDefaultProperty(
- pname: String,
- sources: Seq[ChainPropProvider]): PropertyLookupResult = {
- //
- // Important - use of stream here insures we don't lookup
- // properties down the chain once we have them here.
- //
- val str = sources.toStream.map { _.chainFindProperty(pname) }
- val optFound = str.collectFirst { case found: Found => found }
- val result = optFound match {
- case Some(f: Found) => f
- case None => {
- val seq = str.toSeq
- // merge all the NotFound stuff.
- val nonDefaults = seq.flatMap {
- case NotFound(nd, d, _) => nd
- case _: Found => Assert.invariantFailed()
- }
- val defaults = seq.flatMap {
- case NotFound(nd, d, _) => d
- case _: Found => Assert.invariantFailed()
- }
- Assert.invariant(defaults.isEmpty)
- val nf = NotFound(nonDefaults, defaults, pname)
- nf
- }
- }
- result
- }
-
- /**
- * Use this when you want to know if a property is defined exactly on a
- * component. This ignores any default properties or properties defined on
- * element references. For example, if you want to know if a property was
- * defined on a global element decl rather than an element reference to that
- * decl.
- */
- final def findPropertyOptionThisComponentOnly(pname: String): PropertyLookupResult = {
- val result = findDefaultOrNonDefaultProperty(pname, Seq(nonDefaultFormatChain))
- result
- }
}
/**
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
index 263e9d2..4b20a6b 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala
@@ -45,7 +45,7 @@ final class DFDLEscapeScheme(node: Node, decl: AnnotatedSchemaComponent, defES:
final lazy val referringComponent: Option[SchemaComponent] = Some(defES)
- final override def findPropertyOption(pname: String): PropertyLookupResult = {
+ protected final override def lookupProperty(pname: String): PropertyLookupResult = {
ExecutionMode.requireCompilerMode // never get properties at runtime, only compile time.
val propNodeSeq = xml.attribute(pname)
propNodeSeq match {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
index 50e0518..6a43609 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GlobalElementDecl.scala
@@ -26,7 +26,8 @@ final class GlobalElementDecl(
extends AnnotatedSchemaComponentImpl(xmlArg, schemaDocument)
with GlobalElementComponentMixin
with ElementDeclMixin
- with NestingTraversesToReferenceMixin {
+ with NestingTraversesToReferenceMixin
+ with ResolvesProperties {
// global elements combined with element references referring to them can
// be multiple occurring (aka arrays) hence, we have to have things
// that take root and referenced situation into account.
@@ -44,7 +45,7 @@ final class GlobalElementDecl(
// findPropertyOption, since the later will also inspect the element ref.
// The element ref is allowed to have the dfdl:choiceBranchKey option, so
// we must not inspect it.
- val found = findPropertyOptionThisComponentOnly("choiceBranchKey")
+ val found = findPropertyOption("choiceBranchKey")
if (found.isDefined) {
SDE("dfdl:choiceBranchKey cannot be specified on a global element declaration")
}
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
index 0aef247..d3dcc62 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/GroupDef.scala
@@ -112,7 +112,8 @@ sealed abstract class GlobalGroupDef(
extends AnnotatedSchemaComponentImpl(groupXML, schemaDocumentArg)
with GroupDefLike
with GlobalNonElementComponentMixin
- with NestingTraversesToReferenceMixin {
+ with NestingTraversesToReferenceMixin
+ with ResolvesProperties {
requiredEvaluations(groupMembers)
requiredEvaluations(validateChoiceBranchKey)
@@ -121,7 +122,7 @@ sealed abstract class GlobalGroupDef(
def validateChoiceBranchKey(): Unit = {
// Ensure the model group of a global group def do not define choiceBranchKey.
- val found = findPropertyOptionThisComponentOnly("choiceBranchKey")
+ val found = findPropertyOption("choiceBranchKey")
if (found.isDefined) {
SDE("dfdl:choiceBranchKey cannot be specified on the choice/sequence child of a global group definition")
}
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
index 3b1d46d..8f85b8c 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/SequenceGroup.scala
@@ -288,7 +288,8 @@ abstract class SequenceGroupTermBase(
*/
trait SequenceDefMixin
extends AnnotatedSchemaComponent
- with GroupDefLike {
+ with GroupDefLike
+ with ResolvesProperties {
protected final def isMyFormatAnnotation(a: DFDLAnnotation) = a.isInstanceOf[DFDLSequence]
@@ -310,7 +311,7 @@ trait SequenceDefMixin
// So we retrieve it by this lower-level mechanism which only combines short and long form.
//
final lazy val hiddenGroupRefOption = LV('hiddenGroupRefOption) {
- findPropertyOptionThisComponentOnly("hiddenGroupRef")
+ findPropertyOption("hiddenGroupRef")
}.value
}
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 661c8ed..118b6ff 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
@@ -75,16 +75,18 @@ sealed trait SimpleTypeBase extends TypeBase
* In the case of simpleType, it is possible that optRepValueSetFromAttribute will be none
* but the element will still have an optRepValueSet for another source (eg. children elements)
*/
-sealed trait HasRepValueAttributes extends AnnotatedSchemaComponent {
+sealed trait HasRepValueAttributes extends AnnotatedSchemaComponent
+ with ResolvesProperties {
+
def optRepType: Option[SimpleTypeBase]
def optRepValueSet: Option[RepValueSet[AnyRef]]
lazy val (repValuesAttrCooked: Seq[AnyRef], repValueRangesAttrCooked: Seq[(RangeBound[BigInt], RangeBound[BigInt])]) =
optRepType match {
case Some(repType) => {
- val repValueSetRaw = findPropertyOptionThisComponentOnly("repValues").toOption
+ val repValueSetRaw = findPropertyOption("repValues").toOption
.map(_.split("\\s+").toSeq).getOrElse(Seq())
- val repValueRangesRaw = findPropertyOptionThisComponentOnly("repValueRanges").toOption
+ val repValueRangesRaw = findPropertyOption("repValueRanges").toOption
.map(_.split("\\s+").toSeq).getOrElse(Seq())
repType.primType match {
case PrimType.String => {
@@ -321,8 +323,8 @@ abstract class SimpleTypeDefBase(xml: Node, lexicalParent: SchemaComponent)
}
}
- lazy val optInputTypeCalc = findPropertyOptionThisComponentOnly("inputTypeCalc")
- lazy val optOutputTypeCalc = findPropertyOptionThisComponentOnly("outputTypeCalc")
+ lazy val optInputTypeCalc = findPropertyOption("inputTypeCalc")
+ lazy val optOutputTypeCalc = findPropertyOption("outputTypeCalc")
lazy val optTypeCalculator: Option[TypeCalculator[AnyRef, AnyRef]] = {
optRepType.flatMap(repType => {
@@ -421,7 +423,7 @@ abstract class SimpleTypeDefBase(xml: Node, lexicalParent: SchemaComponent)
*/
override lazy val optRepType: Option[SimpleTypeBase with NamedMixin] = LV('optRepType) {
lazy val fromSelf: Option[SimpleTypeBase with NamedMixin] = {
- val qName = findPropertyOptionThisComponentOnly("repType").toOption
+ val qName = findPropertyOption("repType").toOption
.map(qn => {
QName.resolveRef(qn, namespaces, tunable).toOption match {
case Some(x) => x
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
index 42458f1..01e8c45 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/Term.scala
@@ -41,6 +41,7 @@ import org.apache.daffodil.schema.annotation.props.gen.Representation
import org.apache.daffodil.dpath.NodeInfo
import org.apache.daffodil.schema.annotation.props.gen.OccursCountKind
import org.apache.daffodil.schema.annotation.props.SeparatorSuppressionPolicy
+import org.apache.daffodil.api.WarnID
/**
* Mixin for objects that are shared, but have consistency checks to be run
@@ -107,10 +108,45 @@ trait Term
statements.foreach { _.checkTerm(this) }
}
+ /**
+ * Used to recursively go through Terms and look for DFDL properties that
+ * have not been accessed and record it as a warning. This function uses the
+ * property cache state to determine which properties have been access, so
+ * this function must only be called after all property accesses are complete
+ * (e.g. schema compilation has finished) to ensure there are no false
+ * positives.
+ */
+ final def checkUnusedProperties: Unit = {
+ // Get the properties defined on this term and what it refers to
+ val localProps = formatAnnotation.justThisOneProperties
+ val refProps = optReferredToComponent.map { _.formatAnnotation.justThisOneProperties }.getOrElse(Map.empty)
+
+ // If a term references a global simple type, we need to inspect the
+ // propCache of the simple type in addition to this terms propCache. This
+ // is because some property lookup results are cached on the global simple
+ // type, like in the case of type calc properties
+ val optSimpleTypeCached = optReferredToComponent.collect { case gstd: GlobalSimpleTypeDef => gstd.propCache }
+ val usedProperties = propCache ++ optSimpleTypeCached.getOrElse(Map.empty)
+
+ localProps.foreach { case (prop, (value, _)) =>
+ if (!usedProperties.contains(prop)) {
+ SDW(WarnID.IgnoreDFDLProperty, "DFDL property was ignored: %s=\"%s\"", prop, value)
+ }
+ }
+
+ refProps.foreach { case (prop, (value, _)) =>
+ if (!usedProperties.contains(prop)) {
+ optReferredToComponent.get.SDW(WarnID.IgnoreDFDLProperty, "DFDL property was ignored: %s=\"%s\"", prop, value)
+ }
+ }
+
+ termChildren.foreach { _.checkUnusedProperties }
+ }
+
def position: Int
def optIgnoreCase: Option[YesNo] = {
- val ic = cachePropertyOption("ignoreCase")
+ val ic = findPropertyOption("ignoreCase")
ic match {
case Found(value, location, _, _) => Some(YesNo(value, location))
case _ => None
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
index 1e28f89..a6b5d00 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInputValueCalc.scala
@@ -29,7 +29,7 @@ class TestInputValueCalc extends Logging {
val testSchema = SchemaUtils.dfdlTestSchema(
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
- <xs:element name="data" type="xs:string" dfdl:textNumberRep="standard" dfdl:representation="text" dfdl:terminator="" dfdl:emptyValueDelimiterPolicy="none" dfdl:inputValueCalc="{ xs:string(42) }" dfdl:initiator="" dfdl:lengthKind="explicit" dfdl:length="1"/>)
+ <xs:element name="data" type="xs:string" dfdl:inputValueCalc="{ xs:string(42) }" />)
val (_, actual) = TestUtils.testString(testSchema, "")
val expected: Node = <data>42</data>
TestUtils.assertEqualsXMLElements(expected, actual)
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
index 2158096..1de96bc 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestPrimitives.scala
@@ -154,13 +154,13 @@ class TestPrimitives {
<xs:element name="root" dfdl:lengthKind="implicit" dfdl:ref="config" dfdl:initiator="{{">
<xs:complexType>
<xs:sequence dfdl:ref="config" dfdl:separator="," dfdl:terminator="::">
- <xs:element name="e1" type="xs:string" dfdl:ref="baseString" dfdl:representation="text"/>
- <xs:element name="e2" type="xs:string" dfdl:ref="baseString" dfdl:representation="text"/>
+ <xs:element name="e1" type="xs:string" dfdl:ref="baseString" />
+ <xs:element name="e2" type="xs:string" dfdl:ref="baseString" />
<xs:element name="e3" dfdl:ref="baseString" dfdl:representation="text">
<xs:complexType>
<xs:sequence dfdl:ref="config" dfdl:separator="/" dfdl:terminator="//">
- <xs:element name="e3_1" type="xs:string" dfdl:ref="baseString" dfdl:representation="text" dfdl:terminator="."/>
- <xs:element name="e3_2" type="xs:string" dfdl:ref="inheritance" dfdl:representation="text"/>
+ <xs:element name="e3_1" type="xs:string" dfdl:ref="baseString" dfdl:terminator="."/>
+ <xs:element name="e3_2" type="xs:string" dfdl:ref="inheritance" />
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
index 6ddf703..903add5 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
@@ -77,7 +77,7 @@ class HasMixin extends SchemaComponentImpl(<foo/>, None)
with TheExamplePropMixin
with NestingLexicalMixin {
- override def findPropertyOption(pname: String) =
+ override def lookupProperty(pname: String) =
Found("left", this, pname, false)
lazy val fileName = "file:dummy"
lazy val properties: PropMap = Map.empty
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 3d6d92b..6efbf6c 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
@@ -421,7 +421,7 @@ trait EmptyElementParsePolicyMixin extends PropertyMixin {
* using its name. E.g., if you need calendarTimeZone, just use
* a.calendarTimeZone (where a is an AnnotatedSchemaComponent)
*/
- private def optionEmptyElementPolicyRaw = cachePropertyOption("emptyElementParsePolicy")
+ private def optionEmptyElementPolicyRaw = findPropertyOption("emptyElementParsePolicy")
private def emptyElementPolicyRaw =
EmptyElementParsePolicy(requireProperty(optionEmptyElementPolicyRaw).value, this)
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/PropertyScoping.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/PropertyScoping.scala
index e7071fd..424a927 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/PropertyScoping.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/schema/annotation/props/PropertyScoping.scala
@@ -112,9 +112,28 @@ trait FindPropertyMixin extends PropTypes {
def SDE(str: String, args: Any*): Nothing
/**
- * Implemented in various ways by users of the mixin.
+ * Implemented in various ways by users of the mixin to find a property. This
+ * should never be directly called to find a property. Instead one should use
+ * findPropertyOption and friends, which ensure that caching is consistent.
*/
- def findPropertyOption(pname: String): PropertyLookupResult
+ protected def lookupProperty(pname: String): PropertyLookupResult
+
+ val propCache = new scala.collection.mutable.LinkedHashMap[String, PropertyLookupResult]
+
+ final def findPropertyOption(pname: String): PropertyLookupResult = {
+
+ val propCacheResult = propCache.get(pname)
+ val propRes =
+ propCacheResult match {
+ case Some(res) => res
+ case None => {
+ val lr = lookupProperty(pname)
+ propCache.put(pname, lr)
+ lr
+ }
+ }
+ propRes
+ }
/**
* Call this to find/get a property.
@@ -206,36 +225,4 @@ trait FindPropertyMixin extends PropTypes {
case _: NotFound => false
}
}
-
- private val propCache = new scala.collection.mutable.LinkedHashMap[String, PropertyLookupResult]
-
- protected final def cachePropertyOption(name: String): PropertyLookupResult = {
- val propCacheResult = propCache.get(name)
- val propRes =
- propCacheResult match {
- case Some(res) => res
- case None => {
- val lr = findPropertyOption(name)
- propCache.put(name, lr)
- lr
- }
- }
- propRes
- }
-
- protected final def cacheProperty(name: String): Found = {
- val propCacheResult = cachePropertyOption(name)
- propCacheResult match {
- case f: Found => f
- case nf: NotFound => requiredButNotFound(nf)
- }
- }
-
- protected final def cacheGetPropertyOption(name: String): Option[String] = {
- val pOpt = cachePropertyOption(name)
- pOpt match {
- case Found(v, l, _, _) => Some(v)
- case _ => None
- }
- }
}
diff --git a/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala b/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
index 3c4b729..19c2fa1 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
@@ -81,7 +81,7 @@ class TestGeneratedProperties {
* by using the DFDL property scoping rules to have the right set of property
* definitions in it.
*/
- def findPropertyOption(pname: String): PropertyLookupResult = {
+ def lookupProperty(pname: String): PropertyLookupResult = {
val propNodeSeq = bagOfProps.attribute(pname)
propNodeSeq match {
case None => NotFound(Seq(this), Nil, pname) // attribute was not found
diff --git a/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd b/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
index 795d172..060576d 100644
--- a/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
+++ b/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
@@ -341,7 +341,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="suppressSchemaDefinitionWarnings" type="daf:TunableSuppressSchemaDefinitionWarnings" default="" minOccurs="0">
+ <xs:element name="suppressSchemaDefinitionWarnings" type="daf:TunableSuppressSchemaDefinitionWarnings" default="emptyElementParsePolicyError" minOccurs="0">
<xs:annotation>
<xs:documentation>
Space-separated list of schema definition warnings that should be ignored,
@@ -419,6 +419,7 @@
<xs:enumeration value="facetExplicitLengthOutOfRange" />
<xs:enumeration value="floatingError" />
<xs:enumeration value="ignoreImport" />
+ <xs:enumeration value="ignoreDFDLProperty" />
<xs:enumeration value="inconsistentLengthKind" />
<xs:enumeration value="multipleChoiceBranches" />
<xs:enumeration value="namespaceDifferencesOnly" />
diff --git a/daffodil-propgen/src/main/scala/org/apache/daffodil/propGen/PropertyGenerator.scala b/daffodil-propgen/src/main/scala/org/apache/daffodil/propGen/PropertyGenerator.scala
index 0a8c5f1..a577406 100644
--- a/daffodil-propgen/src/main/scala/org/apache/daffodil/propGen/PropertyGenerator.scala
+++ b/daffodil-propgen/src/main/scala/org/apache/daffodil/propGen/PropertyGenerator.scala
@@ -370,7 +370,7 @@ trait CurrencyMixin extends PropertyMixin {
* using its name. E.g., if you need calendarTimeZone, just use
* a.calendarTimeZone (where a is an AnnotatedSchemaComponent)
*/
- private def optionCurrencyLookup = cachePropertyOption("currency")
+ private def optionCurrencyLookup = findPropertyOption("currency")
final def optionCurrency = if (optionCurrencyLookup.isDefined) Some(currency) else None
final def optionCurrency_location = if (optionCurrencyLookup.isDefined) Some(currency_location) else None
@@ -455,8 +455,8 @@ trait CurrencyMixin extends PropertyMixin {
def generateEnumInstantiation(propName: String, typeName: String) = {
val midTemplate =
"""
- final def EUR = Currency(cacheProperty("EUR").value, this)
- final def EUR_location = cacheProperty("EUR").location
+ final def EUR = Currency(findProperty("EUR").value, this)
+ final def EUR_location = findProperty("EUR").location
"""
val mid =
if (excludeRuntimeProperties(propName)) ""
@@ -523,11 +523,11 @@ object Currency {
def generateNonEnumInstantiation(propName: String, typeName: String) = {
val converterName = getConverterTypeName(typeName)
val midTemplate = if (converterName != "QName") {
- """ def EUR = convertToTYPE(cacheProperty("EUR").value)
+ """ def EUR = convertToTYPE(findProperty("EUR").value)
"""
} else {
""" def EUR = {
- val cp = cacheProperty("EUR")
+ val cp = findProperty("EUR")
convertToTYPE(cp.value, cp.location)
}
"""
@@ -603,7 +603,7 @@ object Currency {
*/
def generateNonEnumStringPropInit(propName: String) = {
val template =
- """registerToStringFunction(()=>{cacheGetPropertyOption("currency") match {
+ """registerToStringFunction(()=>{getPropertyOption("currency") match {
case None => ""
case Some(value) => "currency='" + value.toString + "'"
}
diff --git a/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala b/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
index 64dd9ef..9830751 100644
--- a/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
+++ b/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
@@ -58,10 +58,10 @@ class TestPropertyGenerator {
</xsd:attributeGroup>
val pg = new PropertyGenerator(sch)
val mx = pg.genAttributeGroup(sch)
- assertTrue(mx.contains(""" = convertToBoolean(cacheProperty("prefixIncludesPrefixLength").value)"""))
+ assertTrue(mx.contains(""" = convertToBoolean(findProperty("prefixIncludesPrefixLength").value)"""))
assertTrue(mx.contains("""LengthKindMixin"""))
assertTrue(mx.contains("""def lengthPropertiesAGInit() : Unit = {"""))
- assertTrue(mx.contains("""registerToStringFunction(()=>{cacheGetPropertyOption("lengthPattern") match {
+ assertTrue(mx.contains("""registerToStringFunction(()=>{getPropertyOption("lengthPattern") match {
case None => ""
case Some(value) => "lengthPattern='" + value.toString + "'"
}
@@ -96,7 +96,7 @@ class TestPropertyGenerator {
</xsd:attributeGroup>
val pg = new PropertyGenerator(sch)
val mx = pg.genAttributeGroup(sch)
- assertTrue(mx.contains("""convertToNCName(cacheProperty("textNumberFormatRef")"""))
+ assertTrue(mx.contains("""convertToNCName(findProperty("textNumberFormatRef")"""))
}
@Test def testGenCT() {
@@ -127,8 +127,8 @@ class TestPropertyGenerator {
</xsd:complexType>
val pg = new PropertyGenerator(sch)
val mx = pg.genComplexType(sch)
- assertTrue(mx.contains("""convertToNCName(cacheProperty("name").value)"""))
- assertTrue(mx.contains("""cacheProperty("baseFormat")"""))
+ assertTrue(mx.contains("""convertToNCName(findProperty("name").value)"""))
+ assertTrue(mx.contains("""findProperty("baseFormat")"""))
assertTrue(mx.contains("""convertToQName"""))
}
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
index 459d2e0..438a012 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
@@ -140,7 +140,6 @@
dfdl:fillByte="%#r7e;"
dfdl:leadingSkip="0"
dfdl:trailingSkip="0"
- dfdl:representation="text"
>
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
index f68cfec..4bbc3df 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
@@ -54,14 +54,9 @@
</xs:annotation>
<xs:element name="Fixed_string_with_Pads_10_1"
- dfdl:representation="text"
dfdl:lengthUnits="characters"
dfdl:initiator="i"
dfdl:terminator="t"
-
- dfdl:nilValueDelimiterPolicy="both"
- dfdl:nilKind="literalValue"
- dfdl:nilValue="-"
dfdl:length="10"
dfdl:lengthKind="explicit"
dfdl:ignoreCase="yes">
@@ -74,14 +69,9 @@
</xs:element>
<xs:element name="Fixed_string_with_Pads_10_2"
- dfdl:representation="text"
dfdl:lengthUnits="characters"
dfdl:initiator="ST* i initiator :"
dfdl:terminator="*SE t terminator :"
-
- dfdl:nilValueDelimiterPolicy="both"
- dfdl:nilKind="literalValue"
- dfdl:nilValue="-"
dfdl:length="10"
dfdl:lengthKind="explicit">
<xs:simpleType>
@@ -99,16 +89,11 @@
<xs:element name="element1"
minOccurs="1" maxOccurs="1"
- dfdl:representation="text"
dfdl:length="1"
dfdl:lengthKind="explicit"
dfdl:lengthUnits="characters"
dfdl:initiator="%NL;"
- dfdl:terminator=""
-
- dfdl:nilValueDelimiterPolicy="both"
- dfdl:nilKind="literalValue"
- dfdl:nilValue="-">
+ dfdl:terminator="">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -119,16 +104,11 @@
<xs:element name="element2"
minOccurs="1" maxOccurs="1"
- dfdl:representation="text"
dfdl:length="1"
dfdl:lengthKind="explicit"
dfdl:lengthUnits="characters"
dfdl:initiator=""
- dfdl:terminator="%NL;"
-
- dfdl:nilValueDelimiterPolicy="both"
- dfdl:nilKind="literalValue"
- dfdl:nilValue="-">
+ dfdl:terminator="%NL;">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -140,4 +120,4 @@
</xs:complexType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
index 148920d..909244e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
@@ -45,7 +45,6 @@
<xs:sequence dfdl:sequenceKind="ordered" dfdl:initiatedContent="no">
<xs:element name="MyBoolean1" type="xs:boolean" minOccurs="2" maxOccurs="2"
dfdl:representation="text"
- dfdl:textBooleanJustification="left"
dfdl:lengthUnits="bytes"
dfdl:length="5"
dfdl:lengthKind="explicit"
@@ -61,7 +60,6 @@
<xs:sequence dfdl:sequenceKind="ordered" dfdl:initiatedContent="no">
<xs:element name="MyBoolean2" type="xs:boolean" minOccurs="2" maxOccurs="2"
dfdl:representation="text"
- dfdl:textBooleanJustification="right"
dfdl:lengthUnits="bytes"
dfdl:length="1"
dfdl:lengthKind="explicit"
@@ -77,7 +75,6 @@
<xs:sequence dfdl:sequenceKind="ordered" dfdl:initiatedContent="no">
<xs:element name="MyBoolean3" type="xs:boolean" minOccurs="2" maxOccurs="2"
dfdl:representation="text"
- dfdl:textBooleanJustification="right"
dfdl:lengthUnits="bytes"
dfdl:lengthKind="explicit"
dfdl:length="4"
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
index e95a10f..52404e2 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
@@ -51,7 +51,7 @@
</xs:element>
<xs:element name="Test2" type="xs:unsignedShort" dfdl:representation="binary"
- dfdl:binaryNumberCheckPolicy="lax" dfdl:binaryNumberRep="binary"
+ dfdl:binaryNumberRep="binary"
dfdl:lengthKind="explicit" dfdl:length="2">
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
index f9ebdb6..3d6f27d 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
@@ -86,7 +86,7 @@
<!-- parent with specified length -->
<xs:element name="myStringSeq2_controversial" dfdl:lengthKind="explicit" dfdl:length="5">
<xs:complexType>
- <xs:sequence dfdl:initiatedContent="no" dfdl:separatorPosition="infix"
+ <xs:sequence dfdl:initiatedContent="no"
dfdl:sequenceKind="ordered" dfdl:separator="" >
<xs:element name="Test1" type="xs:string">
</xs:element>
@@ -100,7 +100,7 @@
<!-- parent with specified length -->
<xs:element name="myStringSeq2" dfdl:lengthKind="delimited" dfdl:terminator=";"> <!-- dfdl:lengthKind="explicit" dfdl:length="5"> -->
<xs:complexType>
- <xs:sequence dfdl:initiatedContent="no" dfdl:separatorPosition="infix"
+ <xs:sequence dfdl:initiatedContent="no"
dfdl:sequenceKind="ordered" dfdl:separator="" >
<xs:element name="Test1" type="xs:string">
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsaln101_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsaln101_01.dfdl.xsd
index eef2619..fbea155 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsaln101_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsaln101_01.dfdl.xsd
@@ -59,13 +59,13 @@
dfdl:initiatedContent="no" dfdl:alignment="8">
<xs:element name="Fixed_text_1" type="xs:string"
- minOccurs="1" maxOccurs="1" dfdl:representation="text" dfdl:length="1"
+ minOccurs="1" maxOccurs="1" dfdl:length="1"
dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes">
</xs:element>
<xs:element name="Fixed_text_2a" type="xs:string"
- minOccurs="1" maxOccurs="1" dfdl:representation="text" dfdl:length="2"
+ minOccurs="1" maxOccurs="1" dfdl:length="2"
dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:alignment="4"
dfdl:alignmentUnits="bytes" dfdl:fillByte="%#r66;"
dfdl:leadingSkip="0" dfdl:trailingSkip="0">
@@ -84,7 +84,7 @@
dfdl:initiatedContent="no" dfdl:alignment="8">
<xs:element name="Fixed_text_3" minOccurs="1" maxOccurs="1"
- dfdl:representation="text" dfdl:length="3" dfdl:lengthKind="explicit"
+ dfdl:length="3" dfdl:lengthKind="explicit"
dfdl:lengthUnits="bytes">
<xs:simpleType>
@@ -95,7 +95,7 @@
</xs:element>
<xs:element name="Fixed_text_2a" minOccurs="1" maxOccurs="1"
- dfdl:representation="text" dfdl:length="2" dfdl:lengthKind="explicit"
+ dfdl:length="2" dfdl:lengthKind="explicit"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:alignmentUnits="bytes"
dfdl:fillByte="%#r66;" dfdl:leadingSkip="2" dfdl:trailingSkip="0">
@@ -117,7 +117,7 @@
dfdl:initiatedContent="no" dfdl:alignment="8">
<xs:element name="Fixed_text_3" minOccurs="1" maxOccurs="1"
- dfdl:representation="text" dfdl:length="3" dfdl:lengthKind="explicit"
+ dfdl:length="3" dfdl:lengthKind="explicit"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:alignmentUnits="bytes"
dfdl:fillByte="%#r65;" dfdl:leadingSkip="0" dfdl:trailingSkip="2">
@@ -129,7 +129,7 @@
</xs:element>
<xs:element name="Fixed_text_2a" minOccurs="1" maxOccurs="1"
- dfdl:representation="text" dfdl:length="2" dfdl:lengthKind="explicit"
+ dfdl:length="2" dfdl:lengthKind="explicit"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:alignmentUnits="bytes"
dfdl:fillByte="%#r66;" dfdl:leadingSkip="0" dfdl:trailingSkip="0">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
index 1f0ecfa..f6365b5 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
@@ -37,26 +37,22 @@
</xs:annotation>
<xs:element name="tag1" type="xs:string"
- dfdl:representation="text" dfdl:textStringJustification="left"
dfdl:lengthUnits="bytes" dfdl:length="8" dfdl:lengthKind="explicit"
- dfdl:textTrimKind="none" dfdl:textPadKind="none"
- dfdl:textStringPadCharacter="%SP;">
+ dfdl:textTrimKind="none" dfdl:textPadKind="none">
</xs:element>
<xs:element name="tag2" type="xs:string"
- dfdl:representation="text" dfdl:textStringJustification="left"
dfdl:lengthUnits="bytes" dfdl:length="8" dfdl:lengthKind="explicit"
dfdl:textTrimKind="none" dfdl:textPadKind="none"
- dfdl:textStringPadCharacter="%SP;" dfdl:encoding="UTF-32LE">
+ dfdl:encoding="UTF-32LE">
</xs:element>
<xs:element name="tag3" type="xs:string"
- dfdl:representation="text" dfdl:textStringJustification="left"
dfdl:lengthUnits="bytes" dfdl:length="8" dfdl:lengthKind="explicit"
dfdl:textTrimKind="none" dfdl:textPadKind="none"
- dfdl:textStringPadCharacter="%SP;" dfdl:encoding="UTF-32BE">
+ dfdl:encoding="UTF-32BE">
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
index d52dbce..a93ece7 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
@@ -52,8 +52,8 @@
</xs:annotation>
<xs:element name="multibytes" dfdl:ref="config" type="xs:string"
- dfdl:representation="text" dfdl:textStringJustification="left"
+ dfdl:textStringJustification="left"
dfdl:lengthUnits="characters" dfdl:length="6" dfdl:lengthKind="explicit"
dfdl:textTrimKind="padChar" dfdl:textPadKind="padChar"
dfdl:textStringPadCharacter="%NUL;" />
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflstrm101_03.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflstrm101_03.dfdl.xsd
index f467e87..dc3619e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflstrm101_03.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflstrm101_03.dfdl.xsd
@@ -39,7 +39,6 @@
</xs:annotation>
<xs:element name="Fixed_string_with_Pads_9" dfdl:ref="config"
- dfdl:representation="text"
dfdl:lengthUnits="characters"
dfdl:length="9"
dfdl:lengthKind="explicit">
@@ -50,4 +49,4 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
index 71dfbc4..24dd42d 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
@@ -39,7 +39,6 @@
</xs:annotation>
<xs:element name="MyText"
- dfdl:representation="text"
dfdl:lengthUnits="characters"
dfdl:lengthKind="implicit">
<xs:simpleType>
@@ -50,4 +49,4 @@
</xs:simpleType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
index e5b9be2..1c75dc3 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
@@ -80,11 +80,8 @@
<xs:element name="root" dfdl:lengthKind="implicit" dfdl:ref="config">
<xs:complexType>
<xs:sequence dfdl:ref="config">
- <xs:element name="element1" type="xs:string" dfdl:ref="baseString"
- dfdl:representation="text" />
- <xs:element name="element2" type="xs:string" dfdl:ref="baseString"
- dfdl:representation="text" />
-
+ <xs:element name="element1" type="xs:string" dfdl:ref="baseString" />
+ <xs:element name="element2" type="xs:string" dfdl:ref="baseString" />
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
index bd18721..143ba65 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
@@ -82,11 +82,8 @@
<xs:element name="root" dfdl:lengthKind="implicit" dfdl:ref="config">
<xs:complexType>
<xs:sequence dfdl:ref="config">
- <xs:element name="element1" type="xs:string" dfdl:ref="baseString"
- dfdl:representation="text" />
- <xs:element name="element2" type="xs:string" dfdl:ref="baseString"
- dfdl:representation="text" />
-
+ <xs:element name="element1" type="xs:string" dfdl:ref="baseString" />
+ <xs:element name="element2" type="xs:string" dfdl:ref="baseString" />
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
index 10aae8e..94ad803 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
@@ -64,7 +64,6 @@
</xs:appinfo>
</xs:annotation>
- <xs:element name="element1" type="xs:string" dfdl:ref="config"
- dfdl:representation="text" />
+ <xs:element name="element1" type="xs:string" dfdl:ref="config" />
</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
index f5e437d..88758db 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
@@ -51,18 +51,13 @@
</xs:annotation>
<xs:element name="multibytes_1" type="xs:string"
- dfdl:representation="text" dfdl:textStringJustification="left"
dfdl:lengthUnits="bytes" dfdl:length="6" dfdl:lengthKind="explicit"
- dfdl:textTrimKind="none" dfdl:textPadKind="none"
- dfdl:textStringPadCharacter="." />
+ dfdl:textTrimKind="none" dfdl:textPadKind="none" />
<xs:element name="multibytes_2" dfdl:ref="config" type="xs:string"
- dfdl:representation="text"
- dfdl:textStringJustification="left"
dfdl:lengthUnits="characters"
dfdl:length="4"
dfdl:lengthKind="explicit"
dfdl:textTrimKind="none"
- dfdl:textPadKind="none"
- dfdl:textStringPadCharacter="." />
+ dfdl:textPadKind="none" />
</xs:schema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/syntax_entities_6.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/syntax_entities_6.dfdl.xsd
index c1b21b2..cde8101 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/syntax_entities_6.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/syntax_entities_6.dfdl.xsd
@@ -94,7 +94,7 @@
<xs:element name="binbyte" type="xs:byte"
dfdl:lengthUnits="bytes" dfdl:lengthKind="implicit"
dfdl:representation="binary" dfdl:binaryNumberRep="binary"
- dfdl:binaryNumberCheckPolicy="lax" dfdl:alignment="4"
+ dfdl:alignment="4"
dfdl:alignmentUnits="bytes" dfdl:fillByte="%#r7e;"
dfdl:leadingSkip="0" dfdl:trailingSkip="0">
@@ -102,7 +102,7 @@
<xs:element name="binbyte2" type="xs:byte"
dfdl:lengthUnits="bytes" dfdl:lengthKind="implicit"
dfdl:representation="binary" dfdl:binaryNumberRep="binary"
- dfdl:binaryNumberCheckPolicy="lax" dfdl:alignment="4"
+ dfdl:alignment="4"
dfdl:alignmentUnits="bytes" dfdl:fillByte="%#r7e;"
dfdl:leadingSkip="0" dfdl:trailingSkip="0">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
index a0625e2..c6eb6b2 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
@@ -43,9 +43,7 @@
<complexType>
<sequence>
<element name="x" type="xsd:string" dfdl:initiator="%WSP*;x="
- dfdl:representation="text" dfdl:terminator="%NL;"
- dfdl:textStringJustification="right"
- dfdl:textStringPadCharacter="%SP;" />
+ dfdl:terminator="%NL;" />
</sequence>
</complexType>
</element>
@@ -54,9 +52,7 @@
<complexType>
<sequence>
<element name="y" type="xsd:string" dfdl:initiator="%WSP*;y="
- dfdl:terminator="%NL;" dfdl:representation="text"
- dfdl:textStringJustification="right"
- dfdl:textStringPadCharacter="%SP;" />
+ dfdl:terminator="%NL;" />
</sequence>
</complexType>
</element>
@@ -65,9 +61,7 @@
<complexType>
<sequence>
<element name="z" type="xsd:string" dfdl:initiator="%WSP*;z="
- dfdl:terminator="%NL;" dfdl:representation="text"
- dfdl:textStringJustification="right"
- dfdl:textStringPadCharacter="%SP;" />
+ dfdl:terminator="%NL;" />
</sequence>
</complexType>
</element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
index 93224e7..7d33940 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
@@ -42,24 +42,21 @@
<group name="choiceGroup">
<choice>
- <element name="zone1" type="xsd:string" dfdl:terminator="%NL;"
- dfdl:representation="text">
+ <element name="zone1" type="xsd:string" dfdl:terminator="%NL;">
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:discriminator test="{ ../zoneNumber eq 1 }" />
</appinfo>
</annotation>
</element>
- <element name="zone2" type="xsd:string" dfdl:terminator="%NL;"
- dfdl:representation="text">
+ <element name="zone2" type="xsd:string" dfdl:terminator="%NL;">
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:discriminator test="{ ../zoneNumber eq 2 }" />
</appinfo>
</annotation>
</element>
- <element name="zone3" type="xsd:string" dfdl:terminator="%NL;"
- dfdl:representation="text">
+ <element name="zone3" type="xsd:string" dfdl:terminator="%NL;">
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:discriminator test="{ ../zoneNumber eq 3 }" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
index a5480b3..af16013 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
@@ -50,7 +50,7 @@
dfdl:binaryPackedSignCodes="C B F C" dfdl:binaryNumberCheckPolicy="strict"
dfdl:lengthKind="explicit" dfdl:length="2" />
<element name="string" type="xsd:string"
- dfdl:representation="text" dfdl:lengthKind="explicit"
+ dfdl:lengthKind="explicit"
dfdl:encoding="ASCII" dfdl:length="16" />
</sequence>
</complexType>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
index 1a99761..b9d518e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
@@ -112,7 +112,7 @@
<group name="junk_line">
<sequence dfdl:separator="%NL;">
<element name="junk_line" type="xs:string" minOccurs="1"
- maxOccurs="4" dfdl:encoding="ASCII" dfdl:representation="text"
+ maxOccurs="4" dfdl:encoding="ASCII"
dfdl:lengthKind="delimited" />
</sequence>
</group>
@@ -120,7 +120,7 @@
<group name="blank_space">
<sequence>
<element name="blank_space" type="xs:string"
- dfdl:encoding="ASCII" dfdl:representation="text"
+ dfdl:encoding="ASCII"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[^ ]+\s+" />
</sequence>
</group>
@@ -128,7 +128,7 @@
<group name="junk3">
<sequence>
<element name="junk3" type="xs:string" dfdl:terminator=":"
- dfdl:encoding="ASCII" dfdl:representation="text"
+ dfdl:encoding="ASCII"
dfdl:lengthKind="delimited" />
</sequence>
</group>
@@ -136,7 +136,7 @@
<group name="junk4">
<sequence>
<element name="junk4" type="xs:string" minOccurs="1"
- maxOccurs="1" dfdl:encoding="ASCII" dfdl:representation="text"
+ maxOccurs="1" dfdl:encoding="ASCII"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[ ]+" />
</sequence>
</group>
@@ -144,7 +144,7 @@
<group name="junk5">
<sequence>
<element name="junk5" type="xs:string" maxOccurs="1"
- dfdl:terminator=":" dfdl:encoding="ASCII" dfdl:representation="text"
+ dfdl:terminator=":" dfdl:encoding="ASCII"
dfdl:lengthKind="delimited" />
</sequence>
</group>
@@ -153,14 +153,14 @@
<sequence>
<element name="junk6" type="xs:string" maxOccurs="1"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[ ]+"
- dfdl:encoding="ASCII" dfdl:representation="text" />
+ dfdl:encoding="ASCII" />
</sequence>
</group>
<group name="junk7">
<sequence>
<element name="junk7" type="xs:string" maxOccurs="1"
- dfdl:terminator=":" dfdl:encoding="ASCII" dfdl:representation="text"
+ dfdl:terminator=":" dfdl:encoding="ASCII"
dfdl:lengthKind="delimited" />
</sequence>
</group>
@@ -170,7 +170,7 @@
<sequence>
<element name="junk8" type="xs:string" maxOccurs="1"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[ ]+"
- dfdl:encoding="ASCII" dfdl:representation="text" />
+ dfdl:encoding="ASCII" />
</sequence>
</group>
@@ -178,7 +178,7 @@
<sequence>
<element name="junk4" type="xs:string" maxOccurs="1"
dfdl:terminator="-%NL;" dfdl:encoding="ASCII"
- dfdl:representation="text" dfdl:lengthKind="delimited" />
+ dfdl:lengthKind="delimited" />
</sequence>
</group>
@@ -220,12 +220,10 @@
<complexType name="dataline">
<sequence>
<element name="Symptom" type="xs:string" dfdl:lengthKind="pattern"
- dfdl:initiator="%WSP+;" dfdl:lengthPattern="[A-Z]+" dfdl:encoding="ASCII"
- dfdl:textStringJustification="right"
- dfdl:textStringPadCharacter="%SP;" />
+ dfdl:initiator="%WSP+;" dfdl:lengthPattern="[A-Z]+" dfdl:encoding="ASCII" />
<element name="Count" type="xs:int" dfdl:lengthKind="delimited"
- dfdl:terminator="%NL;" dfdl:textStringPadCharacter="%SP;"
- dfdl:textStringJustification="right" dfdl:encoding="ASCII" />
+ dfdl:terminator="%NL;"
+ dfdl:encoding="ASCII" />
</sequence>
</complexType>
@@ -248,8 +246,7 @@
<sequence>
<sequence dfdl:hiddenGroupRef="tns:header" />
<element name="value" type="xs:int"
- dfdl:textStringJustification="right"
- dfdl:textStringPadCharacter="%SP;" dfdl:terminator="%NL;" />
+ dfdl:terminator="%NL;" />
<sequence dfdl:hiddenGroupRef="tns:extraByte" />
</sequence>
</complexType>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
index de1cd5b..920376e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
@@ -53,11 +53,11 @@
<sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
<element name="character" type="xsd:string" maxOccurs="unbounded"
- dfdl:representation="text" dfdl:escapeSchemeRef="tns:pound" />
+ dfdl:escapeSchemeRef="tns:pound" />
</sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
<element name="block" type="xsd:string" maxOccurs="unbounded"
- dfdl:representation="text" dfdl:escapeSchemeRef="tns:cStyleComment" />
+ dfdl:escapeSchemeRef="tns:cStyleComment" />
</sequence>
</sequence>
</complexType>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
index 29a455f..c181d9c 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
@@ -55,13 +55,13 @@
<sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
<element name="character" type="xsd:string" maxOccurs="unbounded"
- dfdl:representation="text" dfdl:lengthKind="delimited"
+ dfdl:lengthKind="delimited"
dfdl:encoding="US-ASCII"
dfdl:escapeSchemeRef="tns:pound" />
</sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
<element name="block" type="xsd:string" maxOccurs="unbounded"
- dfdl:representation="text" dfdl:encoding="US-ASCII"
+ dfdl:encoding="US-ASCII"
dfdl:lengthKind="delimited"
dfdl:escapeSchemeRef="tns:cStyleComment" />
</sequence>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
index 76a5bc3..5bdf303 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
@@ -53,10 +53,10 @@
<complexType>
<sequence dfdl:separator="SEPARATOR">
<element name="character" type="xsd:string" maxOccurs="3" minOccurs="0"
- dfdl:representation="text" dfdl:initiator="INITIATOR1" dfdl:escapeSchemeRef="tns:pound"
+ dfdl:initiator="INITIATOR1" dfdl:escapeSchemeRef="tns:pound"
dfdl:terminator="TERMINATOR1" />
<element name="block" type="xsd:string" maxOccurs="unbounded" minOccurs="0"
- dfdl:representation="text" dfdl:initiator="INITIATOR2" dfdl:escapeSchemeRef="tns:StartEnd"
+ dfdl:initiator="INITIATOR2" dfdl:escapeSchemeRef="tns:StartEnd"
dfdl:terminator="TERMINATOR2" />
</sequence>
</complexType>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
index e0a2dad..36671a5 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
@@ -49,7 +49,7 @@
<complexType>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
<element name="character" type="xsd:string" maxOccurs="unbounded"
- dfdl:representation="text" dfdl:escapeSchemeRef="tns:mySweetEscape" />
+ dfdl:escapeSchemeRef="tns:mySweetEscape" />
</sequence>
</complexType>
</element>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
index 9d4e270..4276e79 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
@@ -77,7 +77,7 @@
dfdl:lengthKind="explicit" dfdl:length="5">
<xs:complexType>
<xs:sequence dfdl:initiatedContent="no"
- dfdl:separatorPosition="infix" dfdl:sequenceKind="ordered"
+ dfdl:sequenceKind="ordered"
dfdl:separator="">
<xs:element name="Test1" type="xs:string">
</xs:element>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
index 8b74ffe..5dc3cf2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
@@ -94,7 +94,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="raw" type="tns:uint8" dfdl:outputValueCalc="{ dfdlx:outputTypeCalcNextSiblingInt() }"/>
- <xs:element name="logic" type="tns:AbstractMulitiply2FromInt" dfdl:length="1" dfdl:inputValueCalc="{ 0 }"/>
+ <xs:element name="logic" type="tns:AbstractMulitiply2FromInt" dfdl:inputValueCalc="{ 0 }"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -102,7 +102,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="raw" type="xs:string" dfdl:outputValueCalc="{ dfdlx:outputTypeCalcNextSiblingString() }"/>
- <xs:element name="logic" type="tns:AbstractXYZFromInt" dfdl:length="1" dfdl:inputValueCalc="{ 0 }"/>
+ <xs:element name="logic" type="tns:AbstractXYZFromInt" dfdl:inputValueCalc="{ 0 }"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
index 595ce3a..d0cf90d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
@@ -205,7 +205,7 @@
<xs:complexType name="arrayOutter">
<xs:sequence dfdl:separator=",">
<xs:element name="array" type="ex:array" minOccurs="0"
- maxOccurs="5" dfdl:textNumberRep="standard" dfdl:lengthKind="delimited" />
+ maxOccurs="5" dfdl:lengthKind="delimited" />
</xs:sequence>
</xs:complexType>
@@ -243,7 +243,7 @@
<xs:complexType name="arrayOutter">
<xs:sequence dfdl:separator=",">
<xs:element name="array" type="ex:array" minOccurs="1"
- maxOccurs="5" dfdl:textNumberRep="standard" dfdl:lengthKind="delimited" />
+ maxOccurs="5" dfdl:lengthKind="delimited" />
</xs:sequence>
</xs:complexType>
@@ -282,7 +282,7 @@
<xs:complexType name="arrayOutter">
<xs:sequence dfdl:separator=",">
<xs:element name="array" type="ex:array" minOccurs="3"
- maxOccurs="5" dfdl:textNumberRep="standard" dfdl:lengthKind="delimited" />
+ maxOccurs="5" dfdl:lengthKind="delimited" />
</xs:sequence>
</xs:complexType>
@@ -3292,7 +3292,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="e10" dfdl:lengthKind="delimited" dfdl:lengthUnits="bits">
+ <xs:element name="e10" dfdl:lengthKind="delimited">
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:assert test="{ dfdl:checkConstraints(.) }"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
index eb6e5e5..a6d3f0e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
@@ -44,16 +44,14 @@
<element name="x" type="xsd:hexBinary">
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
- <dfdl:element representation="binary"
- lengthKind="explicit" length="4" />
+ <dfdl:element lengthKind="explicit" length="4" />
</appinfo>
</annotation>
</element>
<element name="y">
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
- <dfdl:element representation="binary"
- lengthKind="implicit" />
+ <dfdl:element lengthKind="implicit" />
</appinfo>
</annotation>
<simpleType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
index d0ca782..97954ca 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
@@ -357,7 +357,7 @@
lengthKind='explicit' alignmentUnits='bytes' alignment='1' binaryNumberRep='binary' />
<xs:element name="littleLeast" type="xs:hexBinary" dfdl:byteOrder="littleEndian"
- dfdl:representation="binary" dfdl:bitOrder='leastSignificantBitFirst' dfdl:length="3"/>
+ dfdl:bitOrder='leastSignificantBitFirst' dfdl:length="3"/>
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
index 6688ecc..99d0213 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
@@ -7088,7 +7088,7 @@
<xs:element name="hB_root05">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string" dfdl:lengthKind="explicit" dfdl:representation="text" dfdl:length="10" dfdl:lengthUnits="characters"/>
+ <xs:element name="str" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="10" dfdl:lengthUnits="characters"/>
<xs:element name="hex" type="xs:hexBinary" dfdl:lengthKind="delimited" dfdl:inputValueCalc="{ xs:hexBinary(../ex:str) }" dfdl:encoding="ISO-8859-1" />
</xs:sequence>
</xs:complexType>
@@ -7119,7 +7119,7 @@
</xs:restriction>
</xs:simpleType>
- <xs:element name="hB_rep" dfdl:representation="text" type="xs:hexBinary" dfdl:lengthKind="delimited" dfdl:encoding="ISO-8859-1"/>
+ <xs:element name="hB_rep" type="xs:hexBinary" dfdl:lengthKind="delimited" dfdl:encoding="ISO-8859-1"/>
<xs:element name="hB_fromString" type="xs:hexBinary" dfdl:encoding="ISO-8859-1" dfdl:inputValueCalc="{ xs:string('DEADBEEF') }" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
index fb96b91..0025d3a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
@@ -1137,7 +1137,7 @@ is multiple bytes in UTF-8 encoding that is used"
<xs:group name="tString50">
<xs:sequence>
<xs:element name="value" type="xs:string" dfdl:lengthKind="pattern"
- dfdl:lengthPattern="[^END]{0,49}(?=END)|.{50}" dfdl:representation="text" />
+ dfdl:lengthPattern="[^END]{0,49}(?=END)|.{50}" />
<xs:sequence
dfdl:terminator="{if (fn:string-length(./ex:value) eq 50) then '%ES; %DEL;' else 'END'}" />
<!-- %DEL is there because %ES cannot be alone in list. -->
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
index b74d1c8..9d1c407 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
@@ -34,7 +34,7 @@
<xs:element name="address" dfdl:lengthKind="implicit">
<xs:complexType>
<xs:sequence dfdl:sequenceKind="ordered" dfdl:separator="*" dfdl:separatorPosition="infix">
- <xs:element name="houseNumber" type="xs:string" dfdl:lengthKind="delimited" dfdl:textNumberPattern="##0"/>
+ <xs:element name="houseNumber" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="street" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="city" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="state" type="xs:string" dfdl:lengthKind="delimited"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
index 20ecfc2..e09fe0a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
@@ -47,9 +47,7 @@
<xs:element ref="street">
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
- <dfdl:element representation="text"
- textNumberRep="standard"
- lengthKind="delimited"
+ <dfdl:element lengthKind="delimited"
encoding="ASCII"/>
</xs:appinfo>
</xs:annotation>
@@ -57,9 +55,7 @@
<xs:element ref="city">
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
- <dfdl:element representation="text"
- textNumberRep="standard"
- lengthKind="delimited"
+ <dfdl:element lengthKind="delimited"
encoding="ASCII"/>
</xs:appinfo>
</xs:annotation>
@@ -67,9 +63,7 @@
<xs:element ref="state">
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
- <dfdl:element representation="text"
- textNumberRep="standard"
- lengthKind="delimited"
+ <dfdl:element lengthKind="delimited"
encoding="ASCII"/>
</xs:appinfo>
</xs:annotation>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_09.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_09.dfdl.xsd
index 70047f7..0868b1a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_09.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_09.dfdl.xsd
@@ -29,7 +29,7 @@
<xs:element name="aElem" type="xs:string" dfdl:initiator="A:" dfdl:terminator=":A"/>
<!-- Note that explicit length is exclusive of initiator and terminator. It's the content length. -->
- <xs:element name="aElem2" type="xs:string" dfdl:representation="binary" dfdl:lengthUnits="characters" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="UTF-16BE" dfdl:initiator="A:" dfdl:terminator=":A"/>
- <xs:element name="aElem3" type="xs:string" dfdl:representation="binary" dfdl:lengthUnits="characters" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="UTF-16BE"/>
+ <xs:element name="aElem2" type="xs:string" dfdl:lengthUnits="characters" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="UTF-16BE" dfdl:initiator="A:" dfdl:terminator=":A"/>
+ <xs:element name="aElem3" type="xs:string" dfdl:lengthUnits="characters" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="UTF-16BE"/>
</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd
index d670f9e..077bedc 100644
Binary files a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd and b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd differ
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
index 460422a..010ce85 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
@@ -47,10 +47,10 @@
<sequence dfdl:separator="," dfdl:encoding="utf-8">
<element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8" />
- <element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
+ <element name="cell" type="xsd:int"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8"
dfdl:inputValueCalc="{ $tns:var1 }" />
- <element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
+ <element name="cell" type="xsd:int"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8"
dfdl:inputValueCalc="{ $tns:var2 }" />
</sequence>
@@ -60,13 +60,13 @@
<element name="row2" dfdl:lengthKind="delimited" dfdl:encoding="utf-8">
<complexType>
<sequence dfdl:separator="," dfdl:encoding="utf-8">
- <element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
+ <element name="cell" type="xsd:int"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8"
dfdl:inputValueCalc="{ $tns:var1 }" />
- <element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
+ <element name="cell" type="xsd:int"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8"
dfdl:inputValueCalc="{ $tns:var2 }" />
- <element name="cell" type="xsd:int" dfdl:textNumberRep="standard"
+ <element name="cell" type="xsd:int"
dfdl:lengthKind="delimited" dfdl:encoding="utf-8"
dfdl:inputValueCalc="{ $tns:var3 }" />
</sequence>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
index 05c1af8..25f9731 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
@@ -137,6 +137,16 @@
<xs:element name="root6_deprecated" type="xs:int" daf:parseUnparsePolicy="unparseOnly" />
+ <xs:element name="root7" type="xs:string" dfdl:textBooleanTrueRep="true">
+ <xs:annotation>
+ <xs:appinfo source="http://www.ogf.org/dfdl/">
+ <dfdl:element textBooleanFalseRep="false">
+ <dfdl:property name="textBooleanJustification">center</dfdl:property>
+ </dfdl:element>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+
</tdml:defineSchema>
<tdml:parserTestCase name="ShortAndLongForm" root="root"
@@ -331,4 +341,22 @@
</tdml:errors>
</tdml:parserTestCase>
+ <!-- This test includes boolean properties that should all be ignored since the type is xs:string -->
+ <tdml:parserTestCase name="ignoredPropertiesWarning" root="root7"
+ model="PropertySyntax" description="warning due to unused properties"
+ roundTrip="true">
+ <tdml:document><![CDATA[1]]></tdml:document>
+ <tdml:warnings>
+ <tdml:warning>DFDL property was ignored</tdml:warning>
+ <tdml:warning>textBooleanTrueRep</tdml:warning>
+ <tdml:warning>textBooleanFalseRep</tdml:warning>
+ <tdml:warning>textBooleanJustification</tdml:warning>
+ </tdml:warnings>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <root7>1</root7>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+ </tdml:parserTestCase>
+
</tdml:testSuite>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesDefined.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesDefined.dfdl.xsd
index 51c663f..ad672a8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesDefined.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesDefined.dfdl.xsd
@@ -48,7 +48,7 @@
</appinfo>
</annotation>
- <xs:element name="one" type="xs:string" dfdl:lengthKind="delimited" dfdl:representation="binary" />
+ <xs:element name="one" type="xs:string" dfdl:lengthKind="delimited" />
<xs:element name="two" type="xs:string" dfdl:encoding="ASCII"/>
<xs:element name="leastFirst" dfdl:lengthKind='implicit' dfdl:alignmentUnits="bits" dfdl:representation="binary" dfdl:bitOrder="leastSignificantBitFirst">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
index bbab354..f48b953 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
@@ -331,19 +331,19 @@
</xs:complexType>
<xs:element name="e6" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="4" />
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="4" />
<xs:element name="e7" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="6" dfdl:leadingSkip="5"/>
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="6" dfdl:leadingSkip="5"/>
<xs:element name="e8" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="1" />
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="1" />
<xs:element name="e9" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="2" dfdl:leadingSkip="1"/>
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="2" dfdl:leadingSkip="1"/>
<xs:element name="e10" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="5" />
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="5" />
<xs:element name="e11">
<xs:complexType>
@@ -1100,7 +1100,7 @@
dfdl:length="4" />
<xs:element name="e6" type="xs:string" dfdl:lengthKind="delimited"
- dfdl:terminator="" dfdl:representation="text" dfdl:alignmentUnits="bits" dfdl:alignment="4" />
+ dfdl:terminator="" dfdl:alignmentUnits="bits" dfdl:alignment="4" />
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
index 6f9c0d6..f227c11 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
@@ -32,24 +32,24 @@
<xs:element name="e2" type="xs:string" dfdl:lengthKind="delimited"
dfdl:leadingSkip="3000000" />
- <xs:element name="e3" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="10" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
+ <xs:element name="e3" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="10" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
- <xs:element name="e4" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="%#ra1;%#ra2;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
+ <xs:element name="e4" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="%#ra1;%#ra2;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
<xs:element name="e5">
<xs:complexType>
<xs:sequence dfdl:separator=",">
<xs:element name="encoding" type="xs:string" dfdl:lengthKind="delimited"/>
- <xs:element name="e3" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="å¹´" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="{ ../ex:encoding }" dfdl:bitOrder="leastSignificantBitFirst" dfdl:byteOrder="littleEndian"/>
+ <xs:element name="e3" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="å¹´" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="{ ../ex:encoding }" dfdl:bitOrder="leastSignificantBitFirst" dfdl:byteOrder="littleEndian"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="e6" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="%NL;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
+ <xs:element name="e6" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="%NL;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
- <xs:element name="e7" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="%ES;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
+ <xs:element name="e7" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="%ES;" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:encoding="ISO-8859-1" />
- <xs:element name="e8" type="xs:hexBinary" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:fillByte="å¹´" dfdl:lengthKind="explicit" dfdl:length="3"
+ <xs:element name="e8" type="xs:hexBinary" dfdl:lengthUnits="bytes" dfdl:fillByte="å¹´" dfdl:lengthKind="explicit" dfdl:length="3"
dfdl:encoding="X-DFDL-US-ASCII-7-BIT-PACKED" dfdl:bitOrder="leastSignificantBitFirst" dfdl:byteOrder="littleEndian"/>
</tdml:defineSchema>
@@ -60,7 +60,7 @@
<dfdl:format ref="ex:GeneralFormat" representation="binary" encoding="utf-8" alignmentUnits="bits" alignment="4" leadingSkip="0"
occursCountKind='parsed'/>
- <xs:element name="string32be" dfdl:representation="text" type="xs:string" dfdl:encoding="utf-32be" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:lengthUnits="bytes"
+ <xs:element name="string32be" type="xs:string" dfdl:encoding="utf-32be" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:lengthUnits="bytes"
dfdl:alignment="2" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0"/>
@@ -212,7 +212,7 @@
</xs:complexType>
</xs:element>
- <xs:element name="e11" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8"
+ <xs:element name="e11" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:leadingSkip="4">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -227,7 +227,7 @@
<xs:sequence>
<xs:element name="bits" type="xs:unsignedByte" dfdl:representation="binary" dfdl:leadingSkip="0" dfdl:alignment="1"
dfdl:alignmentUnits="bits" dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="4"/>
- <xs:element name="string" type="xs:string" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8" dfdl:leadingSkip="0"
+ <xs:element name="string" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8" dfdl:leadingSkip="0"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits">
</xs:element>
</xs:sequence>
@@ -240,25 +240,25 @@
<xs:element name="bits" type="xs:unsignedByte"
dfdl:terminator="TERM" dfdl:representation="binary" dfdl:leadingSkip="0" dfdl:alignment="1"
dfdl:alignmentUnits="bits" dfdl:lengthKind="explicit" dfdl:lengthUnits="bits" dfdl:length="4"/>
- <xs:element name="string" type="xs:string" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8" dfdl:leadingSkip="0"
+ <xs:element name="string" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="4" dfdl:encoding="utf-8" dfdl:leadingSkip="0"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits">
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
- <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
<xs:element name="e15">
<xs:complexType>
<xs:sequence>
- <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
- <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
</xs:sequence>
</xs:complexType>
@@ -267,9 +267,9 @@
<xs:element name="e16">
<xs:complexType>
<xs:sequence>
- <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -278,9 +278,9 @@
<xs:element name="e17" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence>
- <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -292,9 +292,9 @@
<xs:element name="a" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence>
- <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -302,9 +302,9 @@
<xs:element name="b" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence>
- <xs:element name="b1" type="xs:string" dfdl:terminator="" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="b1" type="xs:string" dfdl:terminator="" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="1" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="b2" type="xs:string" dfdl:initiator="" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="b2" type="xs:string" dfdl:initiator="" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="2" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="1"/>
</xs:sequence>
</xs:complexType>
@@ -316,9 +316,9 @@
<xs:element name="e19" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence dfdl:separator=",">
- <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e14" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="e13" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -330,9 +330,9 @@
<xs:element name="a" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence dfdl:separator=",">
- <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -347,9 +347,9 @@
<xs:element name="a" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:sequence dfdl:separator=",">
- <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="4"/>
</xs:sequence>
</xs:complexType>
@@ -361,9 +361,9 @@
<xs:element name="e22" dfdl:alignment="4" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="2" dfdl:trailingSkip="2">
<xs:complexType>
<xs:choice>
- <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" dfdl:trailingSkip="2"/>
- <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a2" type="xs:string" dfdl:initiator=":" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4"/>
</xs:choice>
</xs:complexType>
@@ -375,9 +375,9 @@
<xs:element name="e23a" minOccurs="2" maxOccurs="2">
<xs:complexType>
<xs:choice>
- <xs:element name="a1" type="xs:string" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:initiator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" dfdl:trailingSkip="2"/>
- <xs:element name="a2" type="xs:string" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a2" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:terminator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4"/>
</xs:choice>
</xs:complexType>
@@ -392,10 +392,10 @@
<xs:element name="e24a" minOccurs="2" maxOccurs="2">
<xs:complexType>
<xs:choice>
- <xs:element name="a1" type="xs:string" dfdl:representation="text" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
+ <xs:element name="a1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="5" dfdl:encoding="ascii"
dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:initiator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" dfdl:trailingSkip="2"/>
- <xs:element name="a2" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
- dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:terminator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4"/>
+ <xs:element name="a2" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
+ dfdl:alignment="8" dfdl:terminator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4"/>
</xs:choice>
</xs:complexType>
</xs:element>
@@ -417,7 +417,7 @@
<xs:complexType>
<xs:sequence dfdl:separator=",">
<xs:element name="repeat" type="xs:string" dfdl:alignmentUnits="bytes" dfdl:alignment="4" dfdl:lengthKind="delimited"
- minOccurs="5" maxOccurs="5" dfdl:representation="text" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
+ minOccurs="5" maxOccurs="5" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -426,7 +426,7 @@
<xs:complexType>
<xs:sequence dfdl:separator=",">
<xs:element name="repeat" type="xs:string" dfdl:terminator="|" dfdl:alignmentUnits="bytes" dfdl:alignment="4" dfdl:lengthKind="delimited"
- minOccurs="5" maxOccurs="5" dfdl:representation="text" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
+ minOccurs="5" maxOccurs="5" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -438,7 +438,7 @@
<xs:complexType>
<xs:sequence dfdl:separator="|">
<xs:element name="inner" type="xs:string" dfdl:initiator="(" dfdl:terminator=")" dfdl:alignmentUnits="bytes" dfdl:alignment="4" dfdl:lengthKind="delimited"
- minOccurs="2" maxOccurs="2" dfdl:representation="text" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
+ minOccurs="2" maxOccurs="2" dfdl:leadingSkip="2" dfdl:trailingSkip="4"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -446,17 +446,17 @@
</xs:complexType>
</xs:element>
- <xs:element name="e28" type="xs:string" dfdl:terminator=":" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
- dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
+ <xs:element name="e28" type="xs:string" dfdl:terminator=":" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
+ dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
- <xs:element name="e29" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
- dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
+ <xs:element name="e29" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii"
+ dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8"/>
<xs:element name="e30" dfdl:lengthKind="delimited" dfdl:terminator=")">
<xs:complexType>
<xs:sequence dfdl:terminator="]" dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8">
- <xs:element name="s1" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
- <xs:element name="s2" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
+ <xs:element name="s1" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
+ <xs:element name="s2" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -464,8 +464,8 @@
<xs:element name="e31" dfdl:lengthKind="delimited" dfdl:terminator=")">
<xs:complexType>
<xs:sequence dfdl:alignment="8" dfdl:alignmentUnits="bits" dfdl:leadingSkip="0" dfdl:trailingSkip="8">
- <xs:element name="s1" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
- <xs:element name="s2" type="xs:string" dfdl:representation="text" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
+ <xs:element name="s1" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
+ <xs:element name="s2" type="xs:string" dfdl:lengthKind="delimited" dfdl:encoding="ascii" dfdl:alignment="8" dfdl:terminator=":"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -524,8 +524,7 @@
<!-- TEXTUAL DATA -->
- <xs:element name="string2" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:lengthUnits="characters" dfdl:alignment="implicit" dfdl:leadingSkip="16"
- dfdl:representation="text"/>
+ <xs:element name="string2" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="3" dfdl:lengthUnits="characters" dfdl:alignment="implicit" dfdl:leadingSkip="16" />
<dfdl:defineFormat name="textImp">
<dfdl:format ref="ex:GeneralFormat" textNumberPattern="###0.###;-###0.###" lengthKind="delimited" representation="text" alignment="implicit" alignmentUnits="bytes" />
@@ -560,7 +559,7 @@
<xs:element name="byteT" type="xs:byte" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="2"/>
<xs:element name="byteT2" type="xs:byte" dfdl:ref="ex:textImpBitAlign" dfdl:encoding="utf-16le" dfdl:leadingSkip="2"/>
<xs:element name="uByteT" type="xs:unsignedByte" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="2"/>
- <xs:element name="floatT" type="xs:float" dfdl:lengthUnits="bytes" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="2"/>
+ <xs:element name="floatT" type="xs:float" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="2"/>
<xs:element name="doubleT" type="xs:double" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="2"/>
<xs:element name="doubleTBits" type="xs:double" dfdl:ref="ex:textImpBitAlign" dfdl:leadingSkip="1"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
index 6919ecf..204dddc 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
@@ -34,15 +34,12 @@
<xs:sequence>
<xs:element name="firstToken" type="xs:string"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[a-zA-Z]+"
- dfdl:representation="text" dfdl:initiator="%WSP+;" />
+ dfdl:initiator="%WSP+;" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+"
- dfdl:representation="text" dfdl:textStringJustification="center"
- dfdl:textStringPadCharacter="%SP;" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+" />
<xs:element name="thirdToken" type="xs:string"
dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" dfdl:textStringJustification="center"
- dfdl:textStringPadCharacter="%SP;" dfdl:terminator="%NL;%WSP*;" />
+ dfdl:terminator="%NL;%WSP*;" />
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
index a2999eb..ef3c6f3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
@@ -47,13 +47,12 @@
maxOccurs="unbounded">
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
- <dfdl:element representation="text"
- lengthKind="delimited" terminator="/" />
+ <dfdl:element lengthKind="delimited" terminator="/" />
</xs:appinfo>
</xs:annotation>
</xs:element>
<xs:element name="file" type="xs:string" minOccurs="0"
- dfdl:representation="text" dfdl:terminator="%NL;"
+ dfdl:terminator="%NL;"
dfdl:lengthKind="delimited" />
</xs:sequence>
</xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/ExplicitTests.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/ExplicitTests.tdml
index 0a254f3..93a72a5 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/ExplicitTests.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/ExplicitTests.tdml
@@ -773,7 +773,7 @@
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
- <xs:element name="stringy" type="xs:string" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit" dfdl:length="6"/>
+ <xs:element name="stringy" type="xs:string" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit" dfdl:length="6"/>
<xs:element name="inty" type="xs:int" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit" dfdl:length="6"/>
<xs:element name="inty02" type="xs:int" dfdl:representation="binary" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit" dfdl:length="2"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PatternTests.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PatternTests.tdml
index f2b9ded..612e69a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PatternTests.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PatternTests.tdml
@@ -70,14 +70,11 @@
<xs:complexType>
<xs:sequence>
<xs:element name="firstToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="[a-zA-Z]+"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="[a-zA-Z]+" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+" />
<xs:element name="thirdToken" type="xs:string"
- dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" />
+ dfdl:lengthKind="explicit" dfdl:length="5" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -86,20 +83,18 @@
<xs:complexType>
<xs:sequence>
<xs:element name="first" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="(b|c|h)at"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="(b|c|h)at" />
<xs:element name="second" type="xs:string"
- dfdl:representation="text" dfdl:lengthKind="pattern"
+ dfdl:lengthKind="pattern"
dfdl:lengthPattern="[^ab]z" />
<xs:element name="third" type="xs:string"
- dfdl:representation="text" dfdl:lengthKind="pattern"
+ dfdl:lengthKind="pattern"
dfdl:lengthPattern="3 4" />
<xs:element name="fourth" type="xs:string"
- dfdl:encoding="ASCII" dfdl:representation="text"
+ dfdl:encoding="ASCII"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[ ]+" />
<xs:element name="fifth" type="xs:string"
- dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" />
+ dfdl:lengthKind="explicit" dfdl:length="5" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -108,11 +103,9 @@
<xs:complexType>
<xs:sequence>
<xs:element name="first" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="(b|c|h)at,"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="(b|c|h)at," />
<xs:element name="fifth" type="xs:string"
- dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" />
+ dfdl:lengthKind="explicit" dfdl:length="5" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -134,14 +127,11 @@
<xs:sequence>
<xs:element name="firstToken" type="xs:string"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[a-zA-Z]+"
- dfdl:nilValue="nil" dfdl:nilKind="literalValue" nillable="true"
- dfdl:representation="text" />
+ dfdl:nilValue="nil" dfdl:nilKind="literalValue" nillable="true" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+" />
<xs:element name="thirdToken" type="xs:string"
- dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" />
+ dfdl:lengthKind="explicit" dfdl:length="5" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -151,14 +141,11 @@
<xs:sequence>
<xs:element name="firstToken" type="xs:string"
dfdl:lengthKind="pattern" dfdl:lengthPattern="[a-zA-Z]*"
- dfdl:nilValue="%ES;" dfdl:nilKind="literalValue" nillable="true"
- dfdl:representation="text" />
+ dfdl:nilValue="%ES;" dfdl:nilKind="literalValue" nillable="true" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="[0-9]+" />
<xs:element name="thirdToken" type="xs:string"
- dfdl:lengthKind="explicit" dfdl:length="5"
- dfdl:representation="text" />
+ dfdl:lengthKind="explicit" dfdl:length="5" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -169,14 +156,11 @@
<xs:sequence dfdl:separator="%NL;, ," dfdl:outputNewLine="%CR;%LF;"
dfdl:separatorPosition="infix" dfdl:terminator=".">
<xs:element name="firstToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="cat"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="cat" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="dog"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="dog" />
<xs:element name="thirdToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="house"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="house" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -193,14 +177,11 @@
<xs:sequence dfdl:separator="%NL;, ," dfdl:outputNewLine="%CR;%LF;"
dfdl:separatorPosition="infix" dfdl:terminator=".">
<xs:element name="firstToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="cat"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="cat" />
<xs:element name="secondToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="dog"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="dog" />
<xs:element name="thirdToken" type="xs:string"
- dfdl:lengthKind="pattern" dfdl:lengthPattern="house"
- dfdl:representation="text" />
+ dfdl:lengthKind="pattern" dfdl:lengthPattern="house" />
<xs:choice>
<xs:element ref="ex:data_01">
<xs:annotation>
@@ -608,7 +589,7 @@
encodingErrorPolicy="replace"/>
<xs:element name="def_04" dfdl:lengthKind="pattern"
- dfdl:lengthPattern="!!.*!!" dfdl:lengthUnits="characters"
+ dfdl:lengthPattern="!!.*!!"
dfdl:encoding="utf-8">
<xs:complexType>
<xs:sequence>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
index 07c13fa..04fc164 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
@@ -45,10 +45,10 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="3" dfdl:textNumberPattern="0000" />
- <xs:element name="int02" type="xs:int" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="3" />
+ <xs:element name="int02" type="xs:int" dfdl:representation="binary" dfdl:length="2" />
- <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="3" dfdl:textNumberPattern="0000" />
+ <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="3" />
<xs:element name="cal01" type="xs:date" dfdl:length="3"
dfdl:calendarPatternKind="explicit" dfdl:calendarPattern="MMddyy"/>
@@ -61,14 +61,14 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="bcd" binaryNumberCheckPolicy="strict"/>
- <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="4" dfdl:textNumberPattern="0000" />
- <xs:element name="uint02" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
- <xs:element name="byte01" type="xs:byte" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
- <xs:element name="short01" type="xs:short" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
- <xs:element name="long01" type="xs:long" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
+ <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="4" />
+ <xs:element name="uint02" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="2" />
+ <xs:element name="byte01" type="xs:byte" dfdl:representation="binary" dfdl:length="2" />
+ <xs:element name="short01" type="xs:short" dfdl:representation="binary" dfdl:length="2" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="2" />
+ <xs:element name="long01" type="xs:long" dfdl:representation="binary" dfdl:length="2" />
- <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="2" dfdl:textNumberPattern="0000" />
+ <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="2" />
<xs:element name="cal01" type="xs:date" dfdl:length="3"
dfdl:calendarPatternKind="explicit" dfdl:calendarPattern="MMddyy"/>
@@ -81,10 +81,10 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="ibm4690Packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
- <xs:element name="int02" type="xs:int" dfdl:representation="binary" dfdl:length="2" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="2" />
+ <xs:element name="int02" type="xs:int" dfdl:representation="binary" dfdl:length="2" />
- <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="2" dfdl:textNumberPattern="0000" />
+ <xs:element name="dec01" type="xs:decimal" dfdl:representation="binary" dfdl:binaryDecimalVirtualPoint="2" dfdl:length="2" />
<xs:element name="cal01" type="xs:date" dfdl:length="3"
dfdl:calendarPatternKind="explicit" dfdl:calendarPattern="MMddyy"/>
@@ -97,7 +97,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" />
</tdml:defineSchema>
@@ -107,7 +107,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="bcd" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:textNumberPattern="0000" />
+ <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" />
</tdml:defineSchema>
@@ -117,7 +117,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bytes" binaryNumberRep="ibm4690Packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" />
</tdml:defineSchema>
@@ -127,7 +127,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bits" binaryNumberRep="packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="7" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="7" />
</tdml:defineSchema>
@@ -137,7 +137,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bits" binaryNumberRep="bcd" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="7" dfdl:textNumberPattern="0000" />
+ <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="7" />
</tdml:defineSchema>
@@ -147,7 +147,7 @@
textNumberCheckPolicy="strict" textNumberPadCharacter="0" textNumberJustification="right"
lengthUnits="bits" binaryNumberRep="ibm4690Packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="7" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="7" />
</tdml:defineSchema>
@@ -158,7 +158,7 @@
lengthUnits="bits" binaryNumberRep="packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"
alignmentUnits="bits" alignment="1"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="8" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="8" />
</tdml:defineSchema>
@@ -169,7 +169,7 @@
lengthUnits="bits" binaryNumberRep="bcd" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"
alignmentUnits="bits" alignment="1"/>
- <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="8" dfdl:textNumberPattern="0000" />
+ <xs:element name="uint01" type="xs:unsignedInt" dfdl:representation="binary" dfdl:length="8" />
</tdml:defineSchema>
@@ -180,7 +180,7 @@
lengthUnits="bits" binaryNumberRep="ibm4690Packed" binaryPackedSignCodes="C D F C" binaryNumberCheckPolicy="strict"
alignmentUnits="bits" alignment="1"/>
- <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="8" dfdl:textNumberPattern="0000" />
+ <xs:element name="int01" type="xs:int" dfdl:representation="binary" dfdl:length="8" />
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml
index 2879cf8..f74d23f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml
@@ -182,32 +182,33 @@
<xs:element name="decimalPad" type="xs:decimal" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar" dfdl:textNumberPattern="begin: # :end"
dfdl:textNumberCheckPolicy="strict" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
<xs:element name="decimalNoPad" type="xs:decimal" dfdl:lengthKind="delimited" dfdl:textTrimKind="none" dfdl:textNumberPattern="begin: # :end"
- dfdl:textNumberCheckPolicy="strict" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
+ dfdl:textNumberCheckPolicy="strict" />
<xs:element name="decimalPad2" type="xs:decimal" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar"
dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
<xs:element name="decimalPad3" type="xs:decimal" dfdl:lengthKind="delimited" dfdl:textTrimKind="none" dfdl:textNumberPattern="**begin: # :end"
dfdl:textNumberCheckPolicy="strict"/>
<xs:element name="intPad" type="xs:int" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar" dfdl:textNumberPattern="begin: # :end"
dfdl:textNumberCheckPolicy="strict" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
+
<xs:element name="nonNegIntPad" type="xs:nonNegativeInteger" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar" dfdl:textNumberPattern="begin: # :end"
dfdl:textNumberCheckPolicy="strict" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
<xs:element name="nonNegIntNoPad" type="xs:nonNegativeInteger" dfdl:lengthKind="delimited" dfdl:textTrimKind="none" dfdl:textNumberPattern="begin: # :end"
- dfdl:textNumberCheckPolicy="strict" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
+ dfdl:textNumberCheckPolicy="strict"/>
<xs:element name="nonNegIntPad2" type="xs:nonNegativeInteger" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar"
dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"/>
<xs:element name="nonNegIntPad3" type="xs:nonNegativeInteger" dfdl:lengthKind="delimited" dfdl:textTrimKind="none" dfdl:textNumberPattern="**begin: # :end"
dfdl:textNumberCheckPolicy="strict"/>
- <xs:element name="hexBinaryPad1" type="xs:hexBinary" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar" dfdl:textNumberPadCharacter="*" dfdl:textNumberJustification="center"
- dfdl:textNumberCheckPolicy="strict" dfdl:representation="binary" dfdl:encoding="ISO-8859-1"/>
+ <xs:element name="hexBinaryPad1" type="xs:hexBinary" dfdl:lengthKind="delimited" dfdl:textTrimKind="padChar"
+ dfdl:encoding="ISO-8859-1"/>
<xs:element name="tnp69" type="xs:float" dfdl:textNumberRep="standard" dfdl:textNumberPattern="'+'###0.00" />
<xs:element name="tnp70" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberPattern="'+'#;-#" />
<xs:element name="tnp71" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberPattern="'E'#;-#" />
<xs:element name="tnp72" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="2" dfdl:textNumberRep="standard" dfdl:textNumberPattern="'+'#;-#" />
- <xs:element name="tnp73" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberPattern="the num: #;-#" dfdl:inputValueCalc="{ 500 }" />
+ <xs:element name="tnp73" type="xs:int" dfdl:textNumberPattern="the num: #;-#" dfdl:inputValueCalc="{ 500 }" />
<xs:element name="tnp74">
<xs:complexType>
@@ -2862,6 +2863,10 @@
<tdml:document>
<tdml:documentPart type="text"></tdml:documentPart>
</tdml:document>
+ <tdml:warnings>
+ <tdml:warning>DFDL property was ignored</tdml:warning>
+ <tdml:warning>textNumberPattern</tdml:warning>
+ </tdml:warnings>
<tdml:infoset>
<tdml:dfdlInfoset>
<tnp73>500</tnp73>
@@ -4027,6 +4032,11 @@
<tdml:documentPart type="text"><![CDATA[NOTANUMBER]]]></tdml:documentPart>
</tdml:document>
+ <tdml:warnings>
+ <tdml:warning>DFDL property was ignored</tdml:warning>
+ <tdml:warning>textStandardNaNRep</tdml:warning>
+ </tdml:warnings>
+
<tdml:errors>
<tdml:error>Parse Error</tdml:error>
<tdml:error>Unable to parse 'NOTANUMBER'</tdml:error>
@@ -4042,6 +4052,11 @@
<tdml:documentPart type="text"><![CDATA[INFINITY]]]></tdml:documentPart>
</tdml:document>
+ <tdml:warnings>
+ <tdml:warning>DFDL property was ignored</tdml:warning>
+ <tdml:warning>textStandardInfinityRep</tdml:warning>
+ </tdml:warnings>
+
<tdml:errors>
<tdml:error>Parse Error</tdml:error>
<tdml:error>Unable to parse 'INFINITY'</tdml:error>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml
index fead5c5..b598a34 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml
@@ -771,11 +771,10 @@
<xs:sequence>
<xs:element name="Creator" type="xs:string" dfdl:terminator="%NL;"
dfdl:initiator="Creator:" dfdl:encoding="ASCII"
- dfdl:representation="text" dfdl:lengthKind="delimited"
+ dfdl:lengthKind="delimited"
dfdl:outputValueCalc="{ ' NCSA' }" />
<xs:element name="Date" type="xs:string" dfdl:terminator="%NL;"
dfdl:initiator="Date:" dfdl:encoding="ASCII"
- dfdl:representation="text"
dfdl:outputValueCalc="{ ' Mon Feb 23 15:20:47 CST 2009' }" />
</xs:sequence>
</xs:complexType>
@@ -945,12 +944,10 @@
<xs:sequence dfdl:separator="%NL;" dfdl:separatorPosition="postfix">
<xs:sequence dfdl:hiddenGroupRef="ex:xCountGroup" />
<xs:element name="x" type="xs:string" maxOccurs="unbounded"
- dfdl:occursCountKind="expression" dfdl:occursCount="{ ../ex:xCount }"
- dfdl:representation="text" />
+ dfdl:occursCountKind="expression" dfdl:occursCount="{ ../ex:xCount }" />
<xs:sequence dfdl:hiddenGroupRef="ex:yCountGroup" />
<xs:element name="y" type="xs:string" maxOccurs="unbounded"
- dfdl:occursCountKind="expression" dfdl:occursCount="{ ../ex:yCount }"
- dfdl:representation="text" />
+ dfdl:occursCountKind="expression" dfdl:occursCount="{ ../ex:yCount }" />
</xs:sequence>
<xs:sequence dfdl:hiddenGroupRef="ex:leftOver" />
</xs:sequence>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupDelimiters.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupDelimiters.tdml
index 7894a2b..c29cdac 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupDelimiters.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupDelimiters.tdml
@@ -96,8 +96,7 @@
<xs:element name="SG_04" dfdl:lengthKind="delimited">
<xs:complexType>
- <xs:sequence dfdl:separatorPosition="infix"
- dfdl:separator="">
+ <xs:sequence dfdl:separator="">
<xs:element name="s1" type="xs:string"
dfdl:lengthKind="explicit" dfdl:length="3" />
<xs:element name="s2" type="xs:string"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml
index bbb1a6b..7f281f3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml
@@ -28,8 +28,7 @@
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
- <xs:sequence dfdl:initiatedContent="yes"
- dfdl:separatorPosition="infix" dfdl:separator="">
+ <xs:sequence dfdl:initiatedContent="yes" dfdl:separator="">
<xs:element name="s1" dfdl:initiator="[" type="xs:int"
dfdl:terminator="]" minOccurs="0" dfdl:lengthKind="explicit"
dfdl:length="{ 3 }" />
@@ -42,8 +41,7 @@
<xs:element name="e2" dfdl:lengthKind="implicit">
<xs:complexType>
- <xs:sequence dfdl:initiatedContent="yes"
- dfdl:separatorPosition="infix" dfdl:separator="">
+ <xs:sequence dfdl:initiatedContent="yes" dfdl:separator="">
<xs:element name="s1" dfdl:initiator="[s1:" type="xs:int"
dfdl:terminator="]" dfdl:lengthKind="explicit"
dfdl:length="{ 3 }" />
@@ -113,4 +111,4 @@
</tdml:errors>
</tdml:parserTestCase>
-</tdml:testSuite>
\ No newline at end of file
+</tdml:testSuite>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
index 4a971b9..a5b0353 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
@@ -522,8 +522,8 @@
<xs:element name="e16">
<xs:complexType>
<xs:sequence dfdl:separator=",">
- <xs:element name="string1" type="xs:string" dfdl:representation="binary" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
- <xs:element name="string2" type="xs:string" dfdl:representation="binary" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
+ <xs:element name="string1" type="xs:string" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
+ <xs:element name="string2" type="xs:string" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
<xs:element name="oneEQtwo" type="xs:boolean" dfdl:inputValueCalc="{ ../ex:string1 eq ../ex:string2 }"/>
</xs:sequence>
</xs:complexType>
@@ -532,8 +532,8 @@
<xs:element name="e17">
<xs:complexType>
<xs:sequence dfdl:separator=",">
- <xs:element name="string1" type="xs:string" dfdl:representation="binary" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
- <xs:element name="string2" type="xs:string" dfdl:representation="binary" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
+ <xs:element name="string1" type="xs:string" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
+ <xs:element name="string2" type="xs:string" dfdl:lengthKind="explicit" dfdl:lengthUnits="bytes" dfdl:length="5"/>
<xs:element name="oneLTtwo" type="xs:boolean" dfdl:inputValueCalc="{ ../ex:string1 lt ../ex:string2 }"/>
</xs:sequence>
</xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
index 29f254e..5d8ef00 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
@@ -238,8 +238,7 @@
<xs:element name="stringLiteralFromString">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string"
- dfdl:representation="text" />
+ <xs:element name="str" type="xs:string" />
<xs:element name="literal" type="xs:string"
dfdl:lengthKind="implicit"
dfdl:inputValueCalc="{ dfdl:stringLiteralFromString( ../ex:str) }" />
@@ -250,8 +249,7 @@
<xs:element name="encodeDFDLEntities">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string"
- dfdl:representation="text" />
+ <xs:element name="str" type="xs:string" />
<xs:element name="literal" type="xs:string"
dfdl:lengthKind="implicit"
dfdl:inputValueCalc="{ dfdl:encodeDFDLEntities( ../ex:str) }" />
@@ -262,8 +260,7 @@
<xs:element name="containsEntity">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string"
- dfdl:representation="text" />
+ <xs:element name="str" type="xs:string" />
<xs:element name="hasEntity" type="xs:boolean"
dfdl:lengthKind="implicit" dfdl:inputValueCalc="{ dfdl:containsEntity('TEST%NL;TEST') }" />
</xs:sequence>
@@ -273,8 +270,7 @@
<xs:element name="containsDFDLEntities">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string"
- dfdl:representation="text" />
+ <xs:element name="str" type="xs:string" />
<xs:element name="hasEntity" type="xs:boolean"
dfdl:lengthKind="implicit" dfdl:inputValueCalc="{ dfdl:containsDFDLEntities('TEST%NL;TEST') }" />
</xs:sequence>
@@ -284,7 +280,7 @@
<xs:element name="containsDFDLEntities1">
<xs:complexType>
<xs:sequence>
- <xs:element name="str" type="xs:string" dfdl:representation="text" />
+ <xs:element name="str" type="xs:string" />
<xs:element name="hasEntity" type="xs:boolean"
dfdl:lengthKind="implicit" dfdl:inputValueCalc="{ dfdl:containsDFDLEntities(xs:string(/ex:containsDFDLEntities1/ex:str)) }" />
</xs:sequence>
@@ -6854,7 +6850,7 @@
<xs:element name="short04">
<xs:complexType>
<xs:sequence>
- <xs:element name="string" type="xs:string" dfdl:representation="binary" dfdl:lengthKind="delimited"/>
+ <xs:element name="string" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="shortified" type="xs:short" dfdl:inputValueCalc="{ xs:short(../ex:string) }"/>
</xs:sequence>
</xs:complexType>
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala
index a00dca5..13f782a 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala
@@ -50,4 +50,5 @@ class TestPropertySyntax {
@Test def test_dfdlxProperty1() { runner1.runOneTest("dfdlxProperty1") }
@Test def test_dfdlxProperty2() { runner1.runOneTest("dfdlxProperty2") }
+ @Test def test_ignoredPropertiesWarning() { runner1.runOneTest("ignoredPropertiesWarning") }
}
diff --git a/tutorials/src/main/resources/bitorder.tutorial.tdml.xml b/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
index d6870e7..1ab287e 100644
--- a/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
+++ b/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
@@ -1727,7 +1727,6 @@ The schema corresponding to this table is given below. This schema is derived fr
alignmentUnits='bytes' alignment='1' binaryNumberRep='binary'/>
<xs:element name="littleLeast" type="xs:hexBinary" dfdl:byteOrder="littleEndian"
- dfdl:representation="binary"
dfdl:bitOrder='leastSignificantBitFirst' dfdl:length="3"/>
</tdml:defineSchema>
@@ -1757,7 +1756,6 @@ The schema corresponding to this table is given below. This schema is derived fr
alignmentUnits='bytes' alignment='1' binaryNumberRep='binary'/>
<xs:element name="littleLeast" type="xs:hexBinary" dfdl:byteOrder="littleEndian"
- dfdl:representation="binary"
dfdl:bitOrder='leastSignificantBitFirst' dfdl:length="3"/>
</tdml:defineSchema>