Fix min/maxOccurs validation for optional elements#1005
Merged
stevedlawrence merged 1 commit intoapache:mainfrom Apr 17, 2023
Merged
Fix min/maxOccurs validation for optional elements#1005stevedlawrence merged 1 commit intoapache:mainfrom
stevedlawrence merged 1 commit intoapache:mainfrom
Conversation
Commit dd60b60 made changes to validation so that it took into account absent elements that incremented the array iteration count but did not actually change the array size. It did this by just counting the actual elements in the infoset. Unfortunately, that change was very subtly broken for optional elements since it assumed maybeLastChild was always a DIArray, but it could actually be a DISimple/DIComplex for optional elements since they use very similar array logic. We could modify this logic to take DISimple/DIComplex nodes into account, but later commit 16c738c added new state to differentiate between the occurs index and the iteration index. So this just modifies the array validation logic so it is very similar to the old logic, but uses the new state that accounts for absent elements. DAFFODIL-2808
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit dd60b60 made changes to validation so that it took into account absent elements that incremented the array iteration count but did not actually change the array size. It did this by just counting the actual elements in the infoset. Unfortunately, that change was very subtly broken for optional elements since it assumed maybeLastChild was always a DIArray, but it could actually be a DISimple/DIComplex for optional elements since they use very similar array logic.
We could modify this logic to take DISimple/DIComplex nodes into account, but later commit 16c738c added new state to differentiate between the occurs index and the iteration index. So this just modifies the array validation logic so it is very similar to the old logic, but uses the new state that accounts for absent elements.
DAFFODIL-2808