Clean-up catalogue extension. #2409
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
ErbB4
reviewed
Sep 18, 2024
| @@ -96,7 +96,7 @@ class ARB_ARBOR_API mechanism_catalogue { | |||
| } | |||
|
|
|||
| // Copy over another catalogue's mechanism and attach a -- possibly empty -- prefix | |||
| void import(const mechanism_catalogue& other, const std::string& prefix); | |||
| void extend(const mechanism_catalogue& other, const std::string& prefix = ""); | |||
There was a problem hiding this comment.
nice. I think I understood this perfectly hehe
ErbB4
reviewed
Sep 18, 2024
| @@ -114,19 +113,19 @@ struct catalogue_state { | |||
| catalogue_state() = default; | |||
|
|
|||
| catalogue_state(const catalogue_state& other) { | |||
| import(other, ""); | |||
| extend(other, ""); | |||
There was a problem hiding this comment.
What is the difference between import and extend, since it is used everywhere
There was a problem hiding this comment.
I renamed the method to avoid clashing with an upcoming in the C++ language (modules will bring import).
So, now all uses of catalogue::import (and catalogue_state::import) must be re-written as extend instead.
ErbB4
approved these changes
Sep 18, 2024
| @@ -114,19 +113,19 @@ struct catalogue_state { | |||
| catalogue_state() = default; | |||
|
|
|||
| catalogue_state(const catalogue_state& other) { | |||
| import(other, ""); | |||
| extend(other, ""); | |||
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.
catalogue::importtocatalogue::extendasimportwill likely be a reserved word due to modules