Refactor attr_lines()
#47
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
`attr_lines` was generating initializers for each of the three OD types
in slightly different ways. This pulls that block out into its own
function so that fixes always happen to all three types, simplifies the
generating a bit, and fixes a few edge cases:
- Removed whitespace at the end of VISIBLE_STRING
- Use '\0' instead of 0 for null in VISIBLE_STRING
- VISIBLE_STRING would generate strings ("") instead of chars ('') as
the array members for ODVariable and ODArray
- _SKIP_INDEXES are always skipped, previously ODRecords were not.
Checking over our current generated configs the only difference in
generated output is using '\0' instead of 0 for VISIBLE_STRINGs and
removing the single space at the end of those lines.
In 791fdd3 I had marked class Card as frozen but it turns out that being a frozen dataclass means it can't be subclassed and in oresat-c3-software, class Node tries to subclass from it.
A similar treatment to attr_lines, the ODVariable specific parts were given their own function. This results in no change in the generated config but: - _SKIP_INDEXES is now always respected - the len of OCTET_STRING for ODVaraible and ODArray looked super suspect, but they were never used so it didn't show up anywhere.
Similar to the previous two, this splits up `obj_lines()` and fixes the OCTET_STRING length calculation. It wasn't used so there's no change in generated output. While I was there I imported the byte-array-esque OD types directly and replaced all the instances with the shorter names.
ryanpdx
approved these changes
Dec 6, 2024
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.
attr_lines()was generating initializers for each of the three OD types in slightly different ways. This pulls that block out into its own function so that fixes always happen to all three types, simplifies the generating a bit, and fixes a few edge cases:the array members for ODVariable and ODArray
Checking over our current generated configs the only difference in generated output is using '\0' instead of 0 for VISIBLE_STRINGs and removing the single space at the end of those lines.
This has also been extended to
_canopennode_h_lines()andobj_lines()with no change of generated output, although the calculation of the length of OCTET_STRING was fixed in cases where we didn't use it.