jadams-tresys commented on a change in pull request #16: Implemented packed
binary formats
URL: https://github.com/apache/incubator-daffodil/pull/16#discussion_r155278356
##########
File path:
daffodil-core/src/main/scala/edu/illinois/ncsa/daffodil/grammar/ElementBaseGrammarMixin.scala
##########
@@ -700,10 +718,19 @@ trait ElementBaseGrammarMixin
binaryNumberKnownLengthInBits > 8)) {
byteOrderRaw // must be defined or SDE
}
- Assert.invariant(binaryIntRep == bin)
- binaryNumberKnownLengthInBits match {
- case -1 => new BinaryIntegerRuntimeLength(this, isSigned)
- case _ => new BinaryIntegerKnownLength(this, isSigned,
binaryNumberKnownLengthInBits)
+ (binaryNumberRep, lengthKind, binaryNumberKnownLengthInBits) match {
+ case (BinaryNumberRep.Binary, _, -1) => new
BinaryIntegerRuntimeLength(this, isSigned)
+ case (BinaryNumberRep.Binary, _, _) => new
BinaryIntegerKnownLength(this, isSigned, binaryNumberKnownLengthInBits)
+ case (BinaryNumberRep.Packed, LengthKind.Delimited, -1) => new
PackedIntegerDelimitedEndOfData(this, isSigned)
+ case (BinaryNumberRep.Packed, _, -1) => new
PackedIntegerRuntimeLength(this, isSigned)
+ case (BinaryNumberRep.Packed, _, _) => new
PackedIntegerKnownLength(this, isSigned, binaryNumberKnownLengthInBits)
+ case (BinaryNumberRep.Bcd, LengthKind.Delimited, -1) => new
BCDIntegerDelimitedEndOfData(this)
+ case (BinaryNumberRep.Bcd, _, -1) => new BCDIntegerRuntimeLength(this)
+ case (BinaryNumberRep.Bcd, _, _) => new BCDIntegerKnownLength(this,
binaryNumberKnownLengthInBits)
+ case (BinaryNumberRep.Ibm4690Packed, LengthKind.Delimited, -1) => new
IBM4690PackedIntegerDelimitedEndOfData(this, isSigned)
+ case (BinaryNumberRep.Ibm4690Packed, _, -1) => new
IBM4690PackedIntegerRuntimeLength(this, isSigned)
+ case (BinaryNumberRep.Ibm4690Packed, _, _) => new
IBM4690PackedIntegerKnownLength(this, isSigned, binaryNumberKnownLengthInBits)
+ case (_, _, binaryRep) => SDE("BinaryNumberRep '%s' is not supported.",
binaryNumberRep.toString)
Review comment:
Will do
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
