Share CompositeTypeContributor's type element collections with MembersCollector
#572
Conversation
This file contains hidden or 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
stakx
force-pushed
the
dp/refactor/members-collector
branch
from
d84e9cd to
333c665
Compare
`TypeElementCollection` contains logic for preventing type element name collisions by means of switching to explicit implementation. `CompositeTypeContributor` doesn't just add collected type elements to its own collections; it first adds them to a `MetaType`, which uses `TypeElementCollection` internally. Because of this, nothing is gained by using `TypeElementCollection` in `CompositeTypeContributor`, too, as one can switch to explicit implemen- tation only once per method.
`checkedMethods` already ensures the same method cannot be added twice.
Using dictionaries for `events`, `methods`, and `properties` in theory prevents duplicates when processing the same `MemberInfo` twice. The code paths leading up to the `Add` methods (plus `checkedMethods`) how- ever already guarantee once-only execution per `MemberInfo`. Because the dictionary keys aren't needed we can use a simpler collection type.
`CollectElementsToProxyInternal` acts both as a command (it invokes type element collectors) and as a query (it returns those collectors, too). This is not ideal. Turn this method into a query (`GetCollectors`). The collectors must be invoked by the caller. This reveals that there is only a single caller: `CompositeTypeContributor`.
Many of `MembersCollector`'s methods have a `hook` parameter so that it can be forwarded to the three `Add` methods. This wouldn't be necessary if it were available e.g. via a field. Simply assigning `hook` to a field in `CollectMembersToProxy` is not ideal because it worsens the temporal dependency: intermediate methods now require that `CollectMembersToProxy` be called beforehand. Assigning `hook` to a field in the constructor would be better, but all sub-class ctors and their callers would have to be refactored, too. Turning the `Add` methods (plus intermediates) into local functions of `CollectMembersToProxy` solves this problem neatly: they gain access to the `hook` parameter, and the temporal problem evaporates since those dependent methods can now be called only inside `CollectMembersToProxy`.
A previous commit revealed that `CompositeTypeContributor` is the sole direct user of `MembersCollector`. It queries the latter's type element collections (`Events`, `Methods`, and `Properties`) only to transfer the elements somewhere else. This means that `MembersCollector` doesn't really need its own collect- ions; it could simply send collected type elements to wherever they need to go. This is done via the new interface `IMembersCollectorSink`. In principle, this also turns `CollectMembersToProxy` into a repeatable operation: `checkedMethods` no longer needs to act double duty as a flag to check whether the method was already called.
stakx
force-pushed
the
dp/refactor/members-collector
branch
from
333c665 to
9902dc2
Compare
jonorossi
approved these changes
Feb 3, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
During proxy type generation, collected events, methods, and properties are stored at three distinct levels:
MetaTypemodel (which is shared by all involved contributors)CompositeTypeContributor)MembersCollector)It turns out that member collectors don't need to hold on to the members they're collecting; their members are only ever queried in order to be transferred into
MetaTypeand the owning contributor.This PR refactors existing code such that member collectors can directly send the collected members to where they need to end up. By doing so, we can avoid unnecessary collection allocations and element copying.