Great Reorganization #824
Open
Great Reorganization #824
+54,138
−48,769
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
|
This has apparently revealed a bug in codegen: bitfields and enums with a base-type of I don't understand the codegen scripts well enough, so I have no idea how to fix this. |
|
|
myk002
reviewed
Feb 2, 2025
There was a problem hiding this comment.
I am in awe of this PR
Is the list of field name/nesting changes in Discord complete? How risky do you think this refactoring is?
My gut feeling is that we should:
- do a bug-fix-focused release of 51.04-r2, branched from 51.04-r1 and just including bugfix cherry picks
- merge this, update the dfhack and scripts repos accordingly, and merge a bunch of other new features
- do a beta release 51.04-r3rc1 (we can expect the new features to draw a good number of beta testers)
- iterate on the beta for a while
- release 51.04-r3 after a few weeks
myk002
reviewed
Feb 2, 2025
quietust
force-pushed
the
master
branch
2 times, most recently
from
a971f1c to
ff9c640
Compare
* fix bug in codegen with enums/bitfields with base-type "ulong" * fix item_tool_graphics_flag so it compiles (Toady's definition is already wrong) * fix site_architecture_change (two anonymous unions with conflicting names) * fix size of d_init_announcementst * add missing histfig_body_state.NONE (from whereabouts_type) * fix instance-vectors for newly-created handlers * get rid of "dye_info" structure * remove trailing whitespace
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.
This PR reorganizes all of the structure definitions into new files corresponding to Toady's header filenames, with all types in the same order as Toady's.
Notable changes:
<compound>s have been added, which may result in the "paths" to certain variables being different.The goal of this change is to make the structure definitions more straightforward to update in the future.
I have not yet attempted to build DFHack against these updates, but I know that there are some changes which will require modifications to DFHack. The total number of codegen output files has increased from 2155 to 3284 so there's going to be a VERY long list of structure size changes to check, but most of them should just be "0 to NNNN" - all existing structures should stay the same size, so if there are any that grew or shrunk, it's possible I introduced an error somewhere along the way.