Simplify generic multiple activity handler #34102
Merged
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.
Summary
SUMMARY: Infrastructure "Simplify generic multiple activity handler"
Purpose of change
Function
generic_multi_activity_handler
is quite big and hard to understand.It is required to simplify it but keep the structure intact as much as possible.
This PR is created as a result of closing PR #33864.
Describe the solution
Simplify generic multiple activity by splitting to chunks and creating specific sub-functions:
generic_multi_activity_locations
: determine all locations for this generic activitygeneric_multi_activity_check_requirement
: check if this activity can not be done immediately because it has some requirementsgeneric_multi_activity_do
: do activity at this locationThe main handler and sub-functions should be easier to maintain now.
Some other minor changes:
auto
when appropriate.Describe alternatives you've considered
Use stages as described in PR #33864 (this approach was rejected after a discussion).
Additional context
None