stevedlawrence closed pull request #101: Fix binaryCalendarRep regression
URL: https://github.com/apache/incubator-daffodil/pull/101
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
index c7540742d..ac389cc6b 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/ElementBaseGrammarMixin.scala
@@ -691,13 +691,13 @@ trait ElementBaseGrammarMixin
}
private lazy val ibm4690PackedKnownLengthCalendar =
prod("ibm4690PackedKnownLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Ibm4690Packed) {
- ibm4690PackedDateKnownLength | ibm4690PackedTimeKnownLength |
ibm4690PackedDateTimeKnownLength
+ ibm4690PackedDateKnownLength || ibm4690PackedTimeKnownLength ||
ibm4690PackedDateTimeKnownLength
}
private lazy val ibm4690PackedRuntimeLengthCalendar =
prod("ibm4690PackedRuntimeLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Ibm4690Packed) {
- ibm4690PackedDateRuntimeLength | ibm4690PackedTimeRuntimeLength |
ibm4690PackedDateTimeRuntimeLength
+ ibm4690PackedDateRuntimeLength || ibm4690PackedTimeRuntimeLength ||
ibm4690PackedDateTimeRuntimeLength
}
private lazy val ibm4690PackedDelimitedLengthCalendar =
prod("ibm4690PackedDelimitedLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Ibm4690Packed) {
- ibm4690PackedDateDelimitedLength | ibm4690PackedTimeDelimitedLength |
ibm4690PackedDateTimeDelimitedLength
+ ibm4690PackedDateDelimitedLength || ibm4690PackedTimeDelimitedLength ||
ibm4690PackedDateTimeDelimitedLength
}
// ibm4690Packed calendar with known length
@@ -734,13 +734,13 @@ trait ElementBaseGrammarMixin
}
private lazy val packedKnownLengthCalendar =
prod("packedKnownLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Packed) {
- packedDateKnownLength | packedTimeKnownLength | packedDateTimeKnownLength
+ packedDateKnownLength || packedTimeKnownLength || packedDateTimeKnownLength
}
private lazy val packedRuntimeLengthCalendar =
prod("packedRuntimeLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Packed) {
- packedDateRuntimeLength | packedTimeRuntimeLength |
packedDateTimeRuntimeLength
+ packedDateRuntimeLength || packedTimeRuntimeLength ||
packedDateTimeRuntimeLength
}
private lazy val packedDelimitedLengthCalendar =
prod("packedDelimitedLengthCalendar", binaryCalendarRep ==
BinaryCalendarRep.Packed) {
- packedDateDelimitedLength | packedTimeDelimitedLength |
packedDateTimeDelimitedLength
+ packedDateDelimitedLength || packedTimeDelimitedLength ||
packedDateTimeDelimitedLength
}
// Packed calendar with known length
----------------------------------------------------------------
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
