Make code gen support EmptyGram #1121
Merged
Conversation
This file contains 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
| @@ -275,6 +276,7 @@ object DaffodilCCodeGenerator | |||
| case g: ElementParseAndUnspecifiedLength => | |||
| elementParseAndUnspecifiedLengthGenerateCode(g, cgState) | |||
| case g: ElementUnused => noop(g) | |||
| case g: Gram if g eq EmptyGram => noop(g) | |||
There was a problem hiding this comment.
It might better to add this as the first case instead:
case g: Gram if g.isEmpty => noop(g)This will still noop EmptyGram's like you have, but also noop non-EmptyGram grammars that determine that they are empty. I'm not sure if it's possible for codgen-c to walk into those or if you'll only ever see empty grammars that are EmptyGram, but it wouldn't hurt.
There was a problem hiding this comment.
Thanks, I have improved the fix as suggested and added a new test case with a test schema containing an empty gram. Ready for review again.
tuxji
requested review from
mbeckerle,
mike-mcgann,
stricklandrbls,
shanedell and
olabusayoT
and removed request for
mbeckerle
mike-mcgann
approved these changes
Nov 28, 2023
Fix the Daffodil C code generator to stop crashing when a schema contains an empty grammar object. Make sure the code gen recognizes empty grams instead of crashing when seeing them. c/DaffodilCCodeGenerator.scala: Add clause to support empty grams. c/TestDaffodilCExamplesGenerator.scala: Add test which fails or passes without or with above fix to verify that fix actually works. DAFFODIL-2863
tuxji
force-pushed
the
ji/emptygram/2863
branch
from
8886d64 to
ba9bfd9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix the Daffodil C code generator to stop crashing on someone's private DFDL schema. Their schema is private and too large to include, but somehow it creates an EmptyGram object. Make sure the code gen recognizes the EmptyGram object instead of crashing when seeing it.
c/DaffodilCCodeGenerator.scala: Add clause to support EmptyGram.
DAFFODIL-2863