Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix for inheritance problem exposed in examples #1891

Merged
merged 10 commits into from
Jul 9, 2023
Merged

Fix for inheritance problem exposed in examples #1891

merged 10 commits into from
Jul 9, 2023

Conversation

lhstrh
Copy link
Member

@lhstrh lhstrh commented Jul 7, 2023

@lhstrh lhstrh marked this pull request as draft July 7, 2023 02:56
@lhstrh lhstrh marked this pull request as ready for review July 8, 2023 06:48
@lhstrh lhstrh requested review from edwardalee and hokeun July 8, 2023 06:49
Copy link
Collaborator

@edwardalee edwardalee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused about the use of the word "inherits" here. You changed all the contains methods to inherits with comment changes like this: from

   * Return true if the specified timer should be included in the code generated for the federate.
    * This means that the timer is used as a trigger in a top-level reaction that belongs to this
    * federate. This also returns true if the program is not federated.

to

    * Return {@code true} if this federate inherits the given timer.

But these don't mean the same thing. Inheriting a timer means that the timer is defined in a class that this reactor extends. But that does not seem to be what is being checked. Perhaps a different word is needed here?

@lhstrh lhstrh requested a review from edwardalee July 8, 2023 20:38
@lhstrh lhstrh enabled auto-merge July 8, 2023 20:46
@lhstrh lhstrh changed the title Fix inheritance problem exposed in examples Fix for inheritance problem exposed in examples Jul 8, 2023
Copy link
Collaborator

@edwardalee edwardalee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, modulo some suggestions on comments and reintroducing initialization of local variables.

@lhstrh lhstrh added this pull request to the merge queue Jul 9, 2023
Merged via the queue into master with commit 4537cfb Jul 9, 2023
@lhstrh lhstrh deleted the inheritance branch July 9, 2023 14:04
@lhstrh
Copy link
Member Author

lhstrh commented Jul 9, 2023

The PR was already on auto-merge, and your approval pushed it onto the merge queue. Next time, when making suggestions, please hit the "request changes" button, not the "approve" one :-) ...I can create a separate PR to make your suggested changes to the comments.

@lhstrh
Copy link
Member Author

lhstrh commented Jul 9, 2023

The PR was already on auto-merge, and your approval pushed it onto the merge queue. Next time, when making suggestions, please hit the "request changes" button, not the "approve" one :-) ...I can create a separate PR to make your suggested changes to the comments.

Alternatively, we could enable a feature that requires all conversations to be resolved prior to merging. I think it might be a good idea because that gives reviewers the ability to approve and still give suggestions for (optional) changes.

lhstrh added a commit that referenced this pull request Jul 9, 2023
github-merge-queue bot pushed a commit that referenced this pull request Jul 10, 2023
Updated comments in response to review of #1891
@lhstrh lhstrh added the bugfix label Aug 28, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inheritance not working with fedgen
2 participants