Skip to content

Commit d1a416c

Browse files
authored
Merge pull request #27 from ModelDriven/ST6RI-72
ST6RI-72 Class extent and classification expressions
2 parents 76152f8 + c6bcd6a commit d1a416c

File tree

24 files changed

+14826
-10928
lines changed

24 files changed

+14826
-10928
lines changed

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
7272
builder.put(grammarAccess.getStepDefinitionAccess().getAlternatives_2(), "rule__StepDefinition__Alternatives_2");
7373
builder.put(grammarAccess.getExpressionDefinitionAccess().getAlternatives_2(), "rule__ExpressionDefinition__Alternatives_2");
7474
builder.put(grammarAccess.getEqualityOperatorAccess().getAlternatives(), "rule__EqualityOperator__Alternatives");
75+
builder.put(grammarAccess.getClassificationOperatorAccess().getAlternatives(), "rule__ClassificationOperator__Alternatives");
7576
builder.put(grammarAccess.getRelationalOperatorAccess().getAlternatives(), "rule__RelationalOperator__Alternatives");
7677
builder.put(grammarAccess.getAdditiveOperatorAccess().getAlternatives(), "rule__AdditiveOperator__Alternatives");
7778
builder.put(grammarAccess.getMultiplicativeOperatorAccess().getAlternatives(), "rule__MultiplicativeOperator__Alternatives");
@@ -224,6 +225,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
224225
builder.put(grammarAccess.getAndExpressionAccess().getGroup_1(), "rule__AndExpression__Group_1__0");
225226
builder.put(grammarAccess.getEqualityExpressionAccess().getGroup(), "rule__EqualityExpression__Group__0");
226227
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");
227230
builder.put(grammarAccess.getRelationalExpressionAccess().getGroup(), "rule__RelationalExpression__Group__0");
228231
builder.put(grammarAccess.getRelationalExpressionAccess().getGroup_1(), "rule__RelationalExpression__Group_1__0");
229232
builder.put(grammarAccess.getAdditiveExpressionAccess().getGroup(), "rule__AdditiveExpression__Group__0");
@@ -238,12 +241,13 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
238241
builder.put(grammarAccess.getPrimaryExpressionAccess().getGroup(), "rule__PrimaryExpression__Group__0");
239242
builder.put(grammarAccess.getPrimaryExpressionAccess().getGroup_1(), "rule__PrimaryExpression__Group_1__0");
240243
builder.put(grammarAccess.getBodyExpressionAccess().getGroup_0(), "rule__BodyExpression__Group_0__0");
241-
builder.put(grammarAccess.getBaseExpressionAccess().getGroup_5(), "rule__BaseExpression__Group_5__0");
244+
builder.put(grammarAccess.getBaseExpressionAccess().getGroup_6(), "rule__BaseExpression__Group_6__0");
242245
builder.put(grammarAccess.getInvocationExpressionAccess().getGroup(), "rule__InvocationExpression__Group__0");
243246
builder.put(grammarAccess.getPositionalTupleAccess().getGroup(), "rule__PositionalTuple__Group__0");
244247
builder.put(grammarAccess.getPositionalTupleAccess().getGroup_1(), "rule__PositionalTuple__Group_1__0");
245248
builder.put(grammarAccess.getNamedTupleAccess().getGroup(), "rule__NamedTuple__Group__0");
246249
builder.put(grammarAccess.getNamedTupleAccess().getGroup_1(), "rule__NamedTuple__Group_1__0");
250+
builder.put(grammarAccess.getClassExtentExpressionAccess().getGroup(), "rule__ClassExtentExpression__Group__0");
247251
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup(), "rule__SequenceConstructionExpression__Group__0");
248252
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup_2(), "rule__SequenceConstructionExpression__Group_2__0");
249253
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getGroup_2_1(), "rule__SequenceConstructionExpression__Group_2_1__0");
@@ -434,6 +438,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
434438
builder.put(grammarAccess.getAndExpressionAccess().getOperandAssignment_1_2(), "rule__AndExpression__OperandAssignment_1_2");
435439
builder.put(grammarAccess.getEqualityExpressionAccess().getOperatorAssignment_1_1(), "rule__EqualityExpression__OperatorAssignment_1_1");
436440
builder.put(grammarAccess.getEqualityExpressionAccess().getOperandAssignment_1_2(), "rule__EqualityExpression__OperandAssignment_1_2");
441+
builder.put(grammarAccess.getClassificationExpressionAccess().getOperatorAssignment_1_1(), "rule__ClassificationExpression__OperatorAssignment_1_1");
442+
builder.put(grammarAccess.getClassificationExpressionAccess().getOwnedRelationshipAssignment_1_2(), "rule__ClassificationExpression__OwnedRelationshipAssignment_1_2");
437443
builder.put(grammarAccess.getRelationalExpressionAccess().getOperatorAssignment_1_1(), "rule__RelationalExpression__OperatorAssignment_1_1");
438444
builder.put(grammarAccess.getRelationalExpressionAccess().getOperandAssignment_1_2(), "rule__RelationalExpression__OperandAssignment_1_2");
439445
builder.put(grammarAccess.getAdditiveExpressionAccess().getOperatorAssignment_1_1(), "rule__AdditiveExpression__OperatorAssignment_1_1");
@@ -459,13 +465,17 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
459465
builder.put(grammarAccess.getPositionalTupleAccess().getOwnedRelationshipAssignment_1_1(), "rule__PositionalTuple__OwnedRelationshipAssignment_1_1");
460466
builder.put(grammarAccess.getNamedTupleAccess().getOwnedRelationshipAssignment_0(), "rule__NamedTuple__OwnedRelationshipAssignment_0");
461467
builder.put(grammarAccess.getNamedTupleAccess().getOwnedRelationshipAssignment_1_1(), "rule__NamedTuple__OwnedRelationshipAssignment_1_1");
468+
builder.put(grammarAccess.getClassExtentExpressionAccess().getOwnedRelationshipAssignment_0(), "rule__ClassExtentExpression__OwnedRelationshipAssignment_0");
469+
builder.put(grammarAccess.getClassExtentExpressionAccess().getOperatorAssignment_2(), "rule__ClassExtentExpression__OperatorAssignment_2");
470+
builder.put(grammarAccess.getTypeReferenceAccess().getOwnedRelationshipAssignment(), "rule__TypeReference__OwnedRelationshipAssignment");
462471
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getElementAssignment_2_0(), "rule__SequenceConstructionExpression__ElementAssignment_2_0");
463472
builder.put(grammarAccess.getSequenceConstructionExpressionAccess().getElementAssignment_2_1_1(), "rule__SequenceConstructionExpression__ElementAssignment_2_1_1");
464473
builder.put(grammarAccess.getBooleanLiteralExpressionAccess().getValueAssignment(), "rule__BooleanLiteralExpression__ValueAssignment");
465474
builder.put(grammarAccess.getStringLiteralExpressionAccess().getValueAssignment(), "rule__StringLiteralExpression__ValueAssignment");
466475
builder.put(grammarAccess.getRealLiteralExpressionAccess().getValueAssignment(), "rule__RealLiteralExpression__ValueAssignment");
467476
builder.put(grammarAccess.getNaturalLiteralExpressionAccess().getValueAssignment(), "rule__NaturalLiteralExpression__ValueAssignment");
468477
builder.put(grammarAccess.getFeatureReferenceAccess().getMemberFeatureAssignment(), "rule__FeatureReference__MemberFeatureAssignment");
478+
builder.put(grammarAccess.getTypeReferenceMemberAccess().getOwnedRelatedElementAssignment(), "rule__TypeReferenceMember__OwnedRelatedElementAssignment");
469479
builder.put(grammarAccess.getNamedExpressionMemberAccess().getMemberNameAssignment_0(), "rule__NamedExpressionMember__MemberNameAssignment_0");
470480
builder.put(grammarAccess.getNamedExpressionMemberAccess().getOwnedRelatedElementAssignment_2(), "rule__NamedExpressionMember__OwnedRelatedElementAssignment_2");
471481
builder.put(grammarAccess.getBodyMemberAccess().getOwnedRelatedElementAssignment(), "rule__BodyMember__OwnedRelatedElementAssignment");

0 commit comments

Comments
 (0)