Skip to content

Commit b5e4a37

Browse files
seidewitzseidewitz
authored
Merge pull request #505 from Systems-Modeling/ST6RI-705
ST6RI-705 Resolutions from SysML v2 FTF Ballot #3
2 parents 31dedd6 + 3ad3120 commit b5e4a37

11 files changed

Lines changed: 11282 additions & 10872 deletions

File tree

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/ViewTest.sysml.xt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ package ViewTest {
8282
frame concern c1;
8383
concern c2;
8484
}
85-
rendering r1: R[0..1];
85+
render rendering r1: R[0..1];
8686

8787
view v: V[0..*] {
8888
expose P::*;

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/SysML.xtextbin‎

85 Bytes
Binary file not shown.

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/parser/antlr/internal/InternalSysML.g‎

Lines changed: 98 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9329,7 +9329,20 @@ ruleConnectionUsage returns [EObject current=null]
93299329
)?
93309330
(
93319331
{
9332-
newCompositeNode(grammarAccess.getConnectionUsageAccess().getConnectorKeywordParserRuleCall_1_0_2_0());
9332+
if ($current==null) {
9333+
$current = createModelElement(grammarAccess.getConnectionUsageRule());
9334+
}
9335+
newCompositeNode(grammarAccess.getConnectionUsageAccess().getValuePartParserRuleCall_1_0_2());
9336+
}
9337+
this_ValuePart_3=ruleValuePart[$current]
9338+
{
9339+
$current = $this_ValuePart_3.current;
9340+
afterParserOrEnumRuleCall();
9341+
}
9342+
)?
9343+
(
9344+
{
9345+
newCompositeNode(grammarAccess.getConnectionUsageAccess().getConnectorKeywordParserRuleCall_1_0_3_0());
93339346
}
93349347
ruleConnectorKeyword
93359348
{
@@ -9339,11 +9352,11 @@ ruleConnectionUsage returns [EObject current=null]
93399352
if ($current==null) {
93409353
$current = createModelElement(grammarAccess.getConnectionUsageRule());
93419354
}
9342-
newCompositeNode(grammarAccess.getConnectionUsageAccess().getConnectorPartParserRuleCall_1_0_2_1());
9355+
newCompositeNode(grammarAccess.getConnectionUsageAccess().getConnectorPartParserRuleCall_1_0_3_1());
93439356
}
9344-
this_ConnectorPart_4=ruleConnectorPart[$current]
9357+
this_ConnectorPart_5=ruleConnectorPart[$current]
93459358
{
9346-
$current = $this_ConnectorPart_4.current;
9359+
$current = $this_ConnectorPart_5.current;
93479360
afterParserOrEnumRuleCall();
93489361
}
93499362
)?
@@ -9363,9 +9376,9 @@ ruleConnectionUsage returns [EObject current=null]
93639376
}
93649377
newCompositeNode(grammarAccess.getConnectionUsageAccess().getConnectorPartParserRuleCall_1_1_1());
93659378
}
9366-
this_ConnectorPart_6=ruleConnectorPart[$current]
9379+
this_ConnectorPart_7=ruleConnectorPart[$current]
93679380
{
9368-
$current = $this_ConnectorPart_6.current;
9381+
$current = $this_ConnectorPart_7.current;
93699382
afterParserOrEnumRuleCall();
93709383
}
93719384
)
@@ -9376,9 +9389,9 @@ ruleConnectionUsage returns [EObject current=null]
93769389
}
93779390
newCompositeNode(grammarAccess.getConnectionUsageAccess().getUsageBodyParserRuleCall_2());
93789391
}
9379-
this_UsageBody_7=ruleUsageBody[$current]
9392+
this_UsageBody_8=ruleUsageBody[$current]
93809393
{
9381-
$current = $this_UsageBody_7.current;
9394+
$current = $this_UsageBody_8.current;
93829395
afterParserOrEnumRuleCall();
93839396
}
93849397
)
@@ -22730,47 +22743,98 @@ ruleViewRenderingUsage returns [EObject current=null]
2273022743
(
2273122744
(
2273222745
(
22733-
{
22734-
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getOwnedRelationshipOwnedReferenceSubsettingParserRuleCall_0_0());
22735-
}
22736-
lv_ownedRelationship_0_0=ruleOwnedReferenceSubsetting
22746+
(
22747+
{
22748+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getOwnedRelationshipOwnedReferenceSubsettingParserRuleCall_0_0_0());
22749+
}
22750+
lv_ownedRelationship_0_0=ruleOwnedReferenceSubsetting
22751+
{
22752+
if ($current==null) {
22753+
$current = createModelElementForParent(grammarAccess.getViewRenderingUsageRule());
22754+
}
22755+
add(
22756+
$current,
22757+
"ownedRelationship",
22758+
lv_ownedRelationship_0_0,
22759+
"org.omg.sysml.xtext.SysML.OwnedReferenceSubsetting");
22760+
afterParserOrEnumRuleCall();
22761+
}
22762+
)
22763+
)
22764+
(
2273722765
{
2273822766
if ($current==null) {
22739-
$current = createModelElementForParent(grammarAccess.getViewRenderingUsageRule());
22767+
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
2274022768
}
22741-
add(
22742-
$current,
22743-
"ownedRelationship",
22744-
lv_ownedRelationship_0_0,
22745-
"org.omg.sysml.xtext.SysML.OwnedReferenceSubsetting");
22769+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getFeatureSpecializationParserRuleCall_0_1());
22770+
}
22771+
this_FeatureSpecialization_1=ruleFeatureSpecialization[$current]
22772+
{
22773+
$current = $this_FeatureSpecialization_1.current;
2274622774
afterParserOrEnumRuleCall();
2274722775
}
22748-
)
22776+
)*
22777+
{
22778+
if ($current==null) {
22779+
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
22780+
}
22781+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getUsageBodyParserRuleCall_0_2());
22782+
}
22783+
this_UsageBody_2=ruleUsageBody[$current]
22784+
{
22785+
$current = $this_UsageBody_2.current;
22786+
afterParserOrEnumRuleCall();
22787+
}
2274922788
)
22789+
|
2275022790
(
22791+
(
22792+
(
22793+
(
22794+
{
22795+
if ($current==null) {
22796+
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
22797+
}
22798+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getUsageExtensionKeywordParserRuleCall_1_0_0_0());
22799+
}
22800+
this_UsageExtensionKeyword_3=ruleUsageExtensionKeyword[$current]
22801+
{
22802+
$current = $this_UsageExtensionKeyword_3.current;
22803+
afterParserOrEnumRuleCall();
22804+
}
22805+
)*
22806+
otherlv_4='rendering'
22807+
{
22808+
newLeafNode(otherlv_4, grammarAccess.getViewRenderingUsageAccess().getRenderingKeyword_1_0_0_1());
22809+
}
22810+
)
22811+
|
22812+
(
22813+
{
22814+
if ($current==null) {
22815+
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
22816+
}
22817+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getUsageExtensionKeywordParserRuleCall_1_0_1());
22818+
}
22819+
this_UsageExtensionKeyword_5=ruleUsageExtensionKeyword[$current]
22820+
{
22821+
$current = $this_UsageExtensionKeyword_5.current;
22822+
afterParserOrEnumRuleCall();
22823+
}
22824+
)+
22825+
)
2275122826
{
2275222827
if ($current==null) {
2275322828
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
2275422829
}
22755-
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getFeatureSpecializationParserRuleCall_1());
22830+
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getUsageParserRuleCall_1_1());
2275622831
}
22757-
this_FeatureSpecialization_1=ruleFeatureSpecialization[$current]
22832+
this_Usage_6=ruleUsage[$current]
2275822833
{
22759-
$current = $this_FeatureSpecialization_1.current;
22834+
$current = $this_Usage_6.current;
2276022835
afterParserOrEnumRuleCall();
2276122836
}
22762-
)*
22763-
{
22764-
if ($current==null) {
22765-
$current = createModelElement(grammarAccess.getViewRenderingUsageRule());
22766-
}
22767-
newCompositeNode(grammarAccess.getViewRenderingUsageAccess().getUsageBodyParserRuleCall_2());
22768-
}
22769-
this_UsageBody_2=ruleUsageBody[$current]
22770-
{
22771-
$current = $this_UsageBody_2.current;
22772-
afterParserOrEnumRuleCall();
22773-
}
22837+
)
2277422838
)
2277522839
;
2277622840

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/parser/antlr/internal/InternalSysML.tokens‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
'event'=71
8080
'exhibit'=118
8181
'exit'=117
82-
'expose'=139
82+
'expose'=140
8383
'false'=168
8484
'filter'=38
8585
'first'=80
@@ -129,7 +129,7 @@
129129
'ref'=32
130130
'references'=56
131131
'render'=138
132-
'rendering'=141
132+
'rendering'=139
133133
'rep'=25
134134
'require'=177
135135
'requirement'=125
@@ -157,7 +157,7 @@
157157
'verify'=179
158158
'via'=95
159159
'view'=137
160-
'viewpoint'=140
160+
'viewpoint'=141
161161
'when'=98
162162
'while'=105
163163
'xor'=147

0 commit comments

Comments
 (0)