Skip to content

ST6RI-866 Substates inherit two "this" features #671

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2025
Merged

ST6RI-866 Substates inherit two "this" features #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a1ad7
ST6RI-866 Updated redefinitions in Actions::Action::subactions::this.
seidewitz Jul 9, 2025
f8cfa22
ST6RI-866 Updated library models for Xpect tests.
seidewitz Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions org.omg.kerml.xpect.tests/library/Occurrences.kerml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ standard library package Occurrences {
* Occurrences that have inner spaces that completely include this occurrence.
*/

feature surroundedSpace: Occurrence[1] subsets that;
end [1] feature surroundingSpace: Occurrence subsets self;
feature surroundedSpace: Occurrence [1] subsets that;
feature surroundingSpace: Occurrence [1] subsets self;

connector :InsideOf
from [0..1] smallerOccurrence references surroundedSpace
Expand Down
4 changes: 2 additions & 2 deletions org.omg.sysml.xpect.tests/library.domain/Analysis/TradeStudies.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ standard library package TradeStudies {
* For a MinimizeObjective, the best value is the minimum one.
*/

in x; fn(x)
in x; eval(x)
};
}

Expand All @@ -117,7 +117,7 @@ standard library package TradeStudies {
* For a MinimizeObjective, the best value is the maximum one.
*/

in x; fn(x)
in x; eval(x)
};
}

Expand Down
4 changes: 2 additions & 2 deletions org.omg.sysml.xpect.tests/library.kernel/Occurrences.kerml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ standard library package Occurrences {
* Occurrences that have inner spaces that completely include this occurrence.
*/

feature surroundedSpace: Occurrence[1] subsets that;
end [1] feature surroundingSpace: Occurrence subsets self;
feature surroundedSpace: Occurrence [1] subsets that;
feature surroundingSpace: Occurrence [1] subsets self;

connector :InsideOf
from [0..1] smallerOccurrence references surroundedSpace
Expand Down
4 changes: 2 additions & 2 deletions org.omg.sysml.xpect.tests/library.systems/Actions.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ standard library package Actions {
* The subperformances of this Action that are Actions.
*/

ref occurrence :>> this = (that as Action).this {
ref occurrence :>> Action::this, actions::this, subperformances::this = (that as Action).this {
doc
/*
* The "this" reference of a subaction is always the same as that of
Expand Down Expand Up @@ -330,7 +330,7 @@ standard library package Actions {
*/

in transitionLinkSource : Action :>> TransitionPerformance::transitionLinkSource;
ref acceptedMessage : MessageAction :>> trigger;
ref acceptedMessage : MessageTransfer, MessageAction :>> trigger;

ref receiver :>> triggerTarget;

Expand Down
2 changes: 1 addition & 1 deletion sysml.library/Systems Library/Actions.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ standard library package Actions {
* The subperformances of this Action that are Actions.
*/

ref occurrence :>> this = (that as Action).this {
ref occurrence :>> Action::this, actions::this, subperformances::this = (that as Action).this {
doc
/*
* The "this" reference of a subaction is always the same as that of
Expand Down