Replace and remove DynDelegate #432
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
SokyranTheDragon
added
1.4
|
Merged with and updated to master, now targeting 1.5 |
|
Reset before merge, then rebase to master |
`DynDelegate` was required to handle 2 possible signatures for the sync worker delegate: - Explicit sync worker delegates would have no return type - Implicit sync worker delegates would return `bool` - Those rules only apply to sync workers registered by using `SyncWorkerAttribute`, not `MP.RegisterSyncWorker` calls - which would treat all as having no return type (and handled in a different location than the one being changed here) `DynDelegate` was used here as when it changed it took a method with no return type - it would return true (`il.Emit(OpCodes.Ldc_I4_1)`). My solution here is to have 2 delegates - one of which has no return type. I then create the appropriate delegate with a call to `Delegate.CreateDelegate`. For delegates that already return a boolean - I pass it further. However, delegates with no return value are first wrapped with a delegate that will then return true (matching `DynDelegate` behaviour. From my initial testing everything seems to work fine as-is. However, I believe some extra testing should be done before applying those changes - specifically with existing mods using `SyncWorkerAttribute`.
Those changes were originally applied to a different file, but it got removed/renamed/code was moved so the changes got lost in the rebase.
SokyranTheDragon
force-pushed
the
replace-dyn-delegate
branch
from
219b93a
to
03681dc
Compare
|
Looks fine, can you undraft it? |
|
Yep, done. |
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.
DynDelegatewas required to handle 2 possible signatures for the sync worker delegate:boolSyncWorkerAttribute, notMP.RegisterSyncWorkercalls - which only support no return types (and are handled in a different location than the one being changed here)DynDelegatewas used here as when it changed it took a method with no return type - it would return true (il.Emit(OpCodes.Ldc_I4_1)).My solution here is to have 2 delegates - one of which has no return type. I then create the appropriate delegate with a call to
Delegate.CreateDelegate. For delegates that already return a boolean - I pass it further. However, delegates with no return value are first wrapped with a delegate that will then return true (matchingDynDelegatebehaviour.From my initial testing everything seems to work fine as-is. However, I believe some extra testing should be done before applying those changes - specifically with existing mods using
SyncWorkerAttribute. Since there could be something obvious I'm missing here I'll be marking this PR as a draft.