Skip to content

Commit de6a36a

Browse files
seidewitzseidewitz
committed
Merge branch 'ST6RI-72' into ST6RI-42
2 parents 5bb9d82 + c6bcd6a commit de6a36a

239 files changed

Lines changed: 27830 additions & 21665 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
6969
builder.put(grammarAccess.getTypePartAccess().getAlternatives_0_2(), "rule__TypePart__Alternatives_0_2");
7070
builder.put(grammarAccess.getSubsettingPartAccess().getAlternatives(), "rule__SubsettingPart__Alternatives");
7171
builder.put(grammarAccess.getConnectorDeclarationAccess().getAlternatives(), "rule__ConnectorDeclaration__Alternatives");
72-
builder.put(grammarAccess.getConnectorEndAccess().getAlternatives(), "rule__ConnectorEnd__Alternatives");
7372
builder.put(grammarAccess.getStepDefinitionAccess().getAlternatives_2(), "rule__StepDefinition__Alternatives_2");
7473
builder.put(grammarAccess.getExpressionDefinitionAccess().getAlternatives_2(), "rule__ExpressionDefinition__Alternatives_2");
7574
builder.put(grammarAccess.getEqualityOperatorAccess().getAlternatives(), "rule__EqualityOperator__Alternatives");
75+
builder.put(grammarAccess.getClassificationOperatorAccess().getAlternatives(), "rule__ClassificationOperator__Alternatives");
7676
builder.put(grammarAccess.getRelationalOperatorAccess().getAlternatives(), "rule__RelationalOperator__Alternatives");
7777
builder.put(grammarAccess.getAdditiveOperatorAccess().getAlternatives(), "rule__AdditiveOperator__Alternatives");
7878
builder.put(grammarAccess.getMultiplicativeOperatorAccess().getAlternatives(), "rule__MultiplicativeOperator__Alternatives");
@@ -199,10 +199,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
199199
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1(), "rule__ConnectorDeclaration__Group_1__0");
200200
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1_1(), "rule__ConnectorDeclaration__Group_1_1__0");
201201
builder.put(grammarAccess.getConnectorDeclarationAccess().getGroup_1_6(), "rule__ConnectorDeclaration__Group_1_6__0");
202-
builder.put(grammarAccess.getConnectorEndAccess().getGroup_0(), "rule__ConnectorEnd__Group_0__0");
203-
builder.put(grammarAccess.getConnectorEndAccess().getGroup_0_0(), "rule__ConnectorEnd__Group_0_0__0");
204-
builder.put(grammarAccess.getConnectorEndAccess().getGroup_1(), "rule__ConnectorEnd__Group_1__0");
205-
builder.put(grammarAccess.getConnectorEndAccess().getGroup_1_0(), "rule__ConnectorEnd__Group_1_0__0");
202+
builder.put(grammarAccess.getConnectorEndMemberAccess().getGroup(), "rule__ConnectorEndMember__Group__0");
203+
builder.put(grammarAccess.getConnectorEndMemberAccess().getGroup_0(), "rule__ConnectorEndMember__Group_0__0");
206204
builder.put(grammarAccess.getStepDefinitionAccess().getGroup(), "rule__StepDefinition__Group__0");
207205
builder.put(grammarAccess.getStepDefinitionAccess().getGroup_2_0(), "rule__StepDefinition__Group_2_0__0");
208206
builder.put(grammarAccess.getStepDefinitionAccess().getGroup_2_1(), "rule__StepDefinition__Group_2_1__0");
@@ -227,6 +225,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
227225
builder.put(grammarAccess.getAndExpressionAccess().getGroup_1(), "rule__AndExpression__Group_1__0");
228226
builder.put(grammarAccess.getEqualityExpressionAccess().getGroup(), "rule__EqualityExpression__Group__0");
229227
builder.put(grammarAccess.getEqualityExpressionAccess().getGroup_1(), "rule__EqualityExpression__Group_1__0");
228+
builder.put(grammarAccess.getClassificationExpressionAccess().getGroup(), "rule__ClassificationExpression__Group__0");
229+
builder.put(grammarAccess.getClassificationExpressionAccess().getGroup_1(), "rule__ClassificationExpression__Group_1__0");
230230
builder.put(grammarAccess.getRelationalExpressionAccess().getGroup(), "rule__RelationalExpression__Group__0");
231231
builder.put(grammarAccess.getRelationalExpressionAccess().getGroup_1(), "rule__RelationalExpression__Group_1__0");
232232
builder.put(grammarAccess.getAdditiveExpressionAccess().getGroup(), "rule__AdditiveExpression__Group__0");
@@ -241,12 +241,13 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
241241
builder.put(grammarAccess.getPrimaryExpressionAccess().getGroup(), "rule__PrimaryExpression__Group__0");
242242
builder.put(grammarAccess.getPrimaryExpressionAccess().getGroup_1(), "rule__PrimaryExpression__Group_1__0");
243243
builder.put(grammarAccess.getBodyExpressionAccess().getGroup_0(), "rule__BodyExpression__Group_0__0");
244-
builder.put(grammarAccess.getBaseExpressionAccess().getGroup_6(), "rule__BaseExpression__Group_6__0");
244+
builder.put(grammarAccess.getBaseExpressionAccess().getGroup_7(), "rule__BaseExpression__Group_7__0");
245245
builder.put(grammarAccess.getInvocationExpressionAccess().getGroup(), "rule__InvocationExpression__Group__0");
246246
builder.put(grammarAccess.getPositionalTupleAccess().getGroup(), "rule__PositionalTuple__Group__0");
247247
builder.put(grammarAccess.getPositionalTupleAccess().getGroup_1(), "rule__PositionalTuple__Group_1__0");
248248
builder.put(grammarAccess.getNamedTupleAccess().getGroup(), "rule__NamedTuple__Group__0");
249249
builder.put(grammarAccess.getNamedTupleAccess().getGroup_1(), "rule__NamedTuple__Group_1__0");
250+
builder.put(grammarAccess.getClassExtentExpressionAccess().getGroup(), "rule__ClassExtentExpression__Group__0");
250251
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup(), "rule__SequenceConstructionExpression__Group__0");
251252
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup_2(), "rule__SequenceConstructionExpression__Group_2__0");
252253
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup_2_1(), "rule__SequenceConstructionExpression__Group_2_1__0");
@@ -417,12 +418,9 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
417418
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_5(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_5");
418419
builder.put(grammarAccess.getConnectorDeclarationAccess().getOwnedRelationshipAssignment_1_6_1(), "rule__ConnectorDeclaration__OwnedRelationshipAssignment_1_6_1");
419420
builder.put(grammarAccess.getConnectorTypingAccess().getTypeAssignment(), "rule__ConnectorTyping__TypeAssignment");
420-
builder.put(grammarAccess.getConnectorEndAccess().getEndAssignment_0_0_0(), "rule__ConnectorEnd__EndAssignment_0_0_0");
421-
builder.put(grammarAccess.getConnectorEndAccess().getFeatureAssignment_0_1(), "rule__ConnectorEnd__FeatureAssignment_0_1");
422-
builder.put(grammarAccess.getConnectorEndAccess().getOwnedRelationshipAssignment_0_2(), "rule__ConnectorEnd__OwnedRelationshipAssignment_0_2");
423-
builder.put(grammarAccess.getConnectorEndAccess().getEndAssignment_1_0_0(), "rule__ConnectorEnd__EndAssignment_1_0_0");
424-
builder.put(grammarAccess.getConnectorEndAccess().getOwnedRelationshipAssignment_1_0_1(), "rule__ConnectorEnd__OwnedRelationshipAssignment_1_0_1");
425-
builder.put(grammarAccess.getConnectorEndAccess().getFeatureAssignment_1_1(), "rule__ConnectorEnd__FeatureAssignment_1_1");
421+
builder.put(grammarAccess.getConnectorEndAccess().getOwnedRelationshipAssignment(), "rule__ConnectorEnd__OwnedRelationshipAssignment");
422+
builder.put(grammarAccess.getConnectorEndMemberAccess().getMemberNameAssignment_0_0(), "rule__ConnectorEndMember__MemberNameAssignment_0_0");
423+
builder.put(grammarAccess.getConnectorEndMemberAccess().getOwnedRelatedElementAssignment_1(), "rule__ConnectorEndMember__OwnedRelatedElementAssignment_1");
426424
builder.put(grammarAccess.getStepDefinitionAccess().getIsAbstractAssignment_0(), "rule__StepDefinition__IsAbstractAssignment_0");
427425
builder.put(grammarAccess.getStepDefinitionAccess().getNameAssignment_2_0_0(), "rule__StepDefinition__NameAssignment_2_0_0");
428426
builder.put(grammarAccess.getStepDefinitionAccess().getOwnedRelationshipAssignment_2_1_1(), "rule__StepDefinition__OwnedRelationshipAssignment_2_1_1");
@@ -446,6 +444,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
446444
builder.put(grammarAccess.getAndExpressionAccess().getOperandAssignment_1_2(), "rule__AndExpression__OperandAssignment_1_2");
447445
builder.put(grammarAccess.getEqualityExpressionAccess().getOperatorAssignment_1_1(), "rule__EqualityExpression__OperatorAssignment_1_1");
448446
builder.put(grammarAccess.getEqualityExpressionAccess().getOperandAssignment_1_2(), "rule__EqualityExpression__OperandAssignment_1_2");
447+
builder.put(grammarAccess.getClassificationExpressionAccess().getOperatorAssignment_1_1(), "rule__ClassificationExpression__OperatorAssignment_1_1");
448+
builder.put(grammarAccess.getClassificationExpressionAccess().getOwnedRelationshipAssignment_1_2(), "rule__ClassificationExpression__OwnedRelationshipAssignment_1_2");
449449
builder.put(grammarAccess.getRelationalExpressionAccess().getOperatorAssignment_1_1(), "rule__RelationalExpression__OperatorAssignment_1_1");
450450
builder.put(grammarAccess.getRelationalExpressionAccess().getOperandAssignment_1_2(), "rule__RelationalExpression__OperandAssignment_1_2");
451451
builder.put(grammarAccess.getAdditiveExpressionAccess().getOperatorAssignment_1_1(), "rule__AdditiveExpression__OperatorAssignment_1_1");
@@ -465,18 +465,23 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
465465
builder.put(grammarAccess.getBodyExpressionAccess().getOwnedRelationshipAssignment_0_3(), "rule__BodyExpression__OwnedRelationshipAssignment_0_3");
466466
builder.put(grammarAccess.getBodyExpressionAccess().getOwnedRelationshipAssignment_1(), "rule__BodyExpression__OwnedRelationshipAssignment_1");
467467
builder.put(grammarAccess.getExpressionTypingAccess().getTypeAssignment(), "rule__ExpressionTyping__TypeAssignment");
468-
builder.put(grammarAccess.getNameExpressionAccess().getReferentAssignment(), "rule__NameExpression__ReferentAssignment");
468+
builder.put(grammarAccess.getFeatureReferenceExpressionAccess().getOwnedRelationshipAssignment(), "rule__FeatureReferenceExpression__OwnedRelationshipAssignment");
469469
builder.put(grammarAccess.getInvocationExpressionAccess().getOwnedRelationshipAssignment_0(), "rule__InvocationExpression__OwnedRelationshipAssignment_0");
470470
builder.put(grammarAccess.getPositionalTupleAccess().getOwnedRelationshipAssignment_0(), "rule__PositionalTuple__OwnedRelationshipAssignment_0");
471471
builder.put(grammarAccess.getPositionalTupleAccess().getOwnedRelationshipAssignment_1_1(), "rule__PositionalTuple__OwnedRelationshipAssignment_1_1");
472472
builder.put(grammarAccess.getNamedTupleAccess().getOwnedRelationshipAssignment_0(), "rule__NamedTuple__OwnedRelationshipAssignment_0");
473473
builder.put(grammarAccess.getNamedTupleAccess().getOwnedRelationshipAssignment_1_1(), "rule__NamedTuple__OwnedRelationshipAssignment_1_1");
474+
builder.put(grammarAccess.getClassExtentExpressionAccess().getOwnedRelationshipAssignment_0(), "rule__ClassExtentExpression__OwnedRelationshipAssignment_0");
475+
builder.put(grammarAccess.getClassExtentExpressionAccess().getOperatorAssignment_2(), "rule__ClassExtentExpression__OperatorAssignment_2");
476+
builder.put(grammarAccess.getTypeReferenceAccess().getOwnedRelationshipAssignment(), "rule__TypeReference__OwnedRelationshipAssignment");
474477
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getElementAssignment_2_0(), "rule__SequenceConstructionExpression__ElementAssignment_2_0");
475478
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getElementAssignment_2_1_1(), "rule__SequenceConstructionExpression__ElementAssignment_2_1_1");
476479
builder.put(grammarAccess.getBooleanLiteralExpressionAccess().getValueAssignment(), "rule__BooleanLiteralExpression__ValueAssignment");
477480
builder.put(grammarAccess.getStringLiteralExpressionAccess().getValueAssignment(), "rule__StringLiteralExpression__ValueAssignment");
478481
builder.put(grammarAccess.getRealLiteralExpressionAccess().getValueAssignment(), "rule__RealLiteralExpression__ValueAssignment");
479482
builder.put(grammarAccess.getNaturalLiteralExpressionAccess().getValueAssignment(), "rule__NaturalLiteralExpression__ValueAssignment");
483+
builder.put(grammarAccess.getFeatureReferenceAccess().getMemberFeatureAssignment(), "rule__FeatureReference__MemberFeatureAssignment");
484+
builder.put(grammarAccess.getTypeReferenceMemberAccess().getOwnedRelatedElementAssignment(), "rule__TypeReferenceMember__OwnedRelatedElementAssignment");
480485
builder.put(grammarAccess.getNamedExpressionMemberAccess().getMemberNameAssignment_0(), "rule__NamedExpressionMember__MemberNameAssignment_0");
481486
builder.put(grammarAccess.getNamedExpressionMemberAccess().getOwnedRelatedElementAssignment_2(), "rule__NamedExpressionMember__OwnedRelatedElementAssignment_2");
482487
builder.put(grammarAccess.getBodyMemberAccess().getOwnedRelatedElementAssignment(), "rule__BodyMember__OwnedRelatedElementAssignment");

0 commit comments

Comments
 (0)