Skip to content

Commit 9f7867b

Browse files
seidewitzseidewitz
authored
Merge pull request #37 from ModelDriven/ST6RI-77
ST6RI-77 Notation for connector subsetting and redefinition.
2 parents cd343a2 + 779d6f7 commit 9f7867b

File tree

13 files changed

+7605
-7264
lines changed

13 files changed

+7605
-7264
lines changed

‎org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/AlfParser.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
218218
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_0(), "rule__ConnectorDeclaration__Group_0__0");
219219
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_0_0(), "rule__ConnectorDeclaration__Group_0_0__0");
220220
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1(), "rule__ConnectorDeclaration__Group_1__0");
221-
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1_6(), "rule__ConnectorDeclaration__Group_1_6__0");
221+
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1_7(), "rule__ConnectorDeclaration__Group_1_7__0");
222222
builder.put(grammarAccess.getConnectorTypePartAccess().getGroup(), "rule__ConnectorTypePart__Group__0");
223223
builder.put(grammarAccess.getConnectorTypePartAccess().getGroup_0(), "rule__ConnectorTypePart__Group_0__0");
224224
builder.put(grammarAccess.getConnectorEndAccess().getGroup(), "rule__ConnectorEnd__Group__0");
@@ -487,9 +487,9 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
487487
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_0_1(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_0_1");
488488
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_0_3(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_0_3");
489489
builder.put(grammarAccess.getConnectorDeclarationAccess().getNameAssignment_1_0(), "rule__ConnectorDeclaration__NameAssignment_1_0");
490-
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_3(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_3");
491-
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_5(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_5");
492-
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6_1(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6_1");
490+
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_4(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_4");
491+
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6");
492+
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_7_1(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_7_1");
493493
builder.put(grammarAccess.getConnectorTypePartAccess().getOwnedRelationshipAssignment_0_1(), "rule__ConnectorTypePart__OwnedRelationshipAssignment_0_1");
494494
builder.put(grammarAccess.getConnectorTypePartAccess().getOwnedRelationshipAssignment_1(), "rule__ConnectorTypePart__OwnedRelationshipAssignment_1");
495495
builder.put(grammarAccess.getConnectorTypePartAccess().getIsOrderedAssignment_2_0(), "rule__ConnectorTypePart__IsOrderedAssignment_2_0");

‎org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.g

+92-38
Original file line numberDiff line numberDiff line change
@@ -15828,6 +15828,7 @@ rule__ConnectorDeclaration__Group_0__3
1582815828
}
1582915829
:
1583015830
rule__ConnectorDeclaration__Group_0__3__Impl
15831+
rule__ConnectorDeclaration__Group_0__4
1583115832
;
1583215833
finally {
1583315834
restoreStackSize(stackSize);
@@ -15848,6 +15849,32 @@ finally {
1584815849
restoreStackSize(stackSize);
1584915850
}
1585015851

15852+
rule__ConnectorDeclaration__Group_0__4
15853+
@init {
15854+
int stackSize = keepStackSize();
15855+
}
15856+
:
15857+
rule__ConnectorDeclaration__Group_0__4__Impl
15858+
;
15859+
finally {
15860+
restoreStackSize(stackSize);
15861+
}
15862+
15863+
rule__ConnectorDeclaration__Group_0__4__Impl
15864+
@init {
15865+
int stackSize = keepStackSize();
15866+
}
15867+
:
15868+
(
15869+
{ before(grammarAccess.getConnectorDeclarationAccess().getSubsettingPartParserRuleCall_0_4()); }
15870+
ruleSubsettingPart
15871+
{ after(grammarAccess.getConnectorDeclarationAccess().getSubsettingPartParserRuleCall_0_4()); }
15872+
)
15873+
;
15874+
finally {
15875+
restoreStackSize(stackSize);
15876+
}
15877+
1585115878

1585215879
rule__ConnectorDeclaration__Group_0_0__0
1585315880
@init {
@@ -16002,9 +16029,9 @@ rule__ConnectorDeclaration__Group_1__2__Impl
1600216029
}
1600316030
:
1600416031
(
16005-
{ before(grammarAccess.getConnectorDeclarationAccess().getLeftParenthesisKeyword_1_2()); }
16006-
'('
16007-
{ after(grammarAccess.getConnectorDeclarationAccess().getLeftParenthesisKeyword_1_2()); }
16032+
{ before(grammarAccess.getConnectorDeclarationAccess().getSubsettingPartParserRuleCall_1_2()); }
16033+
ruleSubsettingPart
16034+
{ after(grammarAccess.getConnectorDeclarationAccess().getSubsettingPartParserRuleCall_1_2()); }
1600816035
)
1600916036
;
1601016037
finally {
@@ -16029,9 +16056,9 @@ rule__ConnectorDeclaration__Group_1__3__Impl
1602916056
}
1603016057
:
1603116058
(
16032-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_3()); }
16033-
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_3)
16034-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_3()); }
16059+
{ before(grammarAccess.getConnectorDeclarationAccess().getLeftParenthesisKeyword_1_3()); }
16060+
'('
16061+
{ after(grammarAccess.getConnectorDeclarationAccess().getLeftParenthesisKeyword_1_3()); }
1603516062
)
1603616063
;
1603716064
finally {
@@ -16056,9 +16083,9 @@ rule__ConnectorDeclaration__Group_1__4__Impl
1605616083
}
1605716084
:
1605816085
(
16059-
{ before(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_4()); }
16060-
','
16061-
{ after(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_4()); }
16086+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_4()); }
16087+
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_4)
16088+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_4()); }
1606216089
)
1606316090
;
1606416091
finally {
@@ -16083,9 +16110,9 @@ rule__ConnectorDeclaration__Group_1__5__Impl
1608316110
}
1608416111
:
1608516112
(
16086-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_5()); }
16087-
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_5)
16088-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_5()); }
16113+
{ before(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_5()); }
16114+
','
16115+
{ after(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_5()); }
1608916116
)
1609016117
;
1609116118
finally {
@@ -16110,9 +16137,9 @@ rule__ConnectorDeclaration__Group_1__6__Impl
1611016137
}
1611116138
:
1611216139
(
16113-
{ before(grammarAccess.getConnectorDeclarationAccess().getGroup_1_6()); }
16114-
(rule__ConnectorDeclaration__Group_1_6__0)*
16115-
{ after(grammarAccess.getConnectorDeclarationAccess().getGroup_1_6()); }
16140+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6()); }
16141+
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6)
16142+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6()); }
1611616143
)
1611716144
;
1611816145
finally {
@@ -16125,6 +16152,7 @@ rule__ConnectorDeclaration__Group_1__7
1612516152
}
1612616153
:
1612716154
rule__ConnectorDeclaration__Group_1__7__Impl
16155+
rule__ConnectorDeclaration__Group_1__8
1612816156
;
1612916157
finally {
1613016158
restoreStackSize(stackSize);
@@ -16136,63 +16164,89 @@ rule__ConnectorDeclaration__Group_1__7__Impl
1613616164
}
1613716165
:
1613816166
(
16139-
{ before(grammarAccess.getConnectorDeclarationAccess().getRightParenthesisKeyword_1_7()); }
16167+
{ before(grammarAccess.getConnectorDeclarationAccess().getGroup_1_7()); }
16168+
(rule__ConnectorDeclaration__Group_1_7__0)*
16169+
{ after(grammarAccess.getConnectorDeclarationAccess().getGroup_1_7()); }
16170+
)
16171+
;
16172+
finally {
16173+
restoreStackSize(stackSize);
16174+
}
16175+
16176+
rule__ConnectorDeclaration__Group_1__8
16177+
@init {
16178+
int stackSize = keepStackSize();
16179+
}
16180+
:
16181+
rule__ConnectorDeclaration__Group_1__8__Impl
16182+
;
16183+
finally {
16184+
restoreStackSize(stackSize);
16185+
}
16186+
16187+
rule__ConnectorDeclaration__Group_1__8__Impl
16188+
@init {
16189+
int stackSize = keepStackSize();
16190+
}
16191+
:
16192+
(
16193+
{ before(grammarAccess.getConnectorDeclarationAccess().getRightParenthesisKeyword_1_8()); }
1614016194
')'
16141-
{ after(grammarAccess.getConnectorDeclarationAccess().getRightParenthesisKeyword_1_7()); }
16195+
{ after(grammarAccess.getConnectorDeclarationAccess().getRightParenthesisKeyword_1_8()); }
1614216196
)
1614316197
;
1614416198
finally {
1614516199
restoreStackSize(stackSize);
1614616200
}
1614716201

1614816202

16149-
rule__ConnectorDeclaration__Group_1_6__0
16203+
rule__ConnectorDeclaration__Group_1_7__0
1615016204
@init {
1615116205
int stackSize = keepStackSize();
1615216206
}
1615316207
:
16154-
rule__ConnectorDeclaration__Group_1_6__0__Impl
16155-
rule__ConnectorDeclaration__Group_1_6__1
16208+
rule__ConnectorDeclaration__Group_1_7__0__Impl
16209+
rule__ConnectorDeclaration__Group_1_7__1
1615616210
;
1615716211
finally {
1615816212
restoreStackSize(stackSize);
1615916213
}
1616016214

16161-
rule__ConnectorDeclaration__Group_1_6__0__Impl
16215+
rule__ConnectorDeclaration__Group_1_7__0__Impl
1616216216
@init {
1616316217
int stackSize = keepStackSize();
1616416218
}
1616516219
:
1616616220
(
16167-
{ before(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_6_0()); }
16221+
{ before(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_7_0()); }
1616816222
','
16169-
{ after(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_6_0()); }
16223+
{ after(grammarAccess.getConnectorDeclarationAccess().getCommaKeyword_1_7_0()); }
1617016224
)
1617116225
;
1617216226
finally {
1617316227
restoreStackSize(stackSize);
1617416228
}
1617516229

16176-
rule__ConnectorDeclaration__Group_1_6__1
16230+
rule__ConnectorDeclaration__Group_1_7__1
1617716231
@init {
1617816232
int stackSize = keepStackSize();
1617916233
}
1618016234
:
16181-
rule__ConnectorDeclaration__Group_1_6__1__Impl
16235+
rule__ConnectorDeclaration__Group_1_7__1__Impl
1618216236
;
1618316237
finally {
1618416238
restoreStackSize(stackSize);
1618516239
}
1618616240

16187-
rule__ConnectorDeclaration__Group_1_6__1__Impl
16241+
rule__ConnectorDeclaration__Group_1_7__1__Impl
1618816242
@init {
1618916243
int stackSize = keepStackSize();
1619016244
}
1619116245
:
1619216246
(
16193-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6_1()); }
16194-
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6_1)
16195-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6_1()); }
16247+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_7_1()); }
16248+
(rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_7_1)
16249+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_7_1()); }
1619616250
)
1619716251
;
1619816252
finally {
@@ -26520,45 +26574,45 @@ finally {
2652026574
restoreStackSize(stackSize);
2652126575
}
2652226576

26523-
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_3
26577+
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_4
2652426578
@init {
2652526579
int stackSize = keepStackSize();
2652626580
}
2652726581
:
2652826582
(
26529-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_3_0()); }
26583+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_4_0()); }
2653026584
ruleConnectorEndMember
26531-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_3_0()); }
26585+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_4_0()); }
2653226586
)
2653326587
;
2653426588
finally {
2653526589
restoreStackSize(stackSize);
2653626590
}
2653726591

26538-
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_5
26592+
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6
2653926593
@init {
2654026594
int stackSize = keepStackSize();
2654126595
}
2654226596
:
2654326597
(
26544-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_5_0()); }
26598+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_6_0()); }
2654526599
ruleConnectorEndMember
26546-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_5_0()); }
26600+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_6_0()); }
2654726601
)
2654826602
;
2654926603
finally {
2655026604
restoreStackSize(stackSize);
2655126605
}
2655226606

26553-
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6_1
26607+
rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_7_1
2655426608
@init {
2655526609
int stackSize = keepStackSize();
2655626610
}
2655726611
:
2655826612
(
26559-
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_6_1_0()); }
26613+
{ before(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_7_1_0()); }
2656026614
ruleConnectorEndMember
26561-
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_6_1_0()); }
26615+
{ after(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipConnectorEndMemberParserRuleCall_1_7_1_0()); }
2656226616
)
2656326617
;
2656426618
finally {

0 commit comments

Comments
 (0)