Skip to content

Commit ef6dddb

Browse files
seidewitzseidewitz
committed
ST6RI-42 Revised QPE grammar for QueryHeadExpression.
1 parent 15a4163 commit ef6dddb

File tree

15 files changed

+3950
-4147
lines changed

15 files changed

+3950
-4147
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
258258
builder.put(grammarAccess.getBodyParameterMemberAccess().getGroup(), "rule__BodyParameterMember__Group__0");
259259
builder.put(grammarAccess.getQueryPathExpressionAccess().getGroup(), "rule__QueryPathExpression__Group__0");
260260
builder.put(grammarAccess.getQueryPathExpressionAccess().getGroup_1(), "rule__QueryPathExpression__Group_1__0");
261-
builder.put(grammarAccess.getQueryPathExpressionAccess().getGroup_1_2(), "rule__QueryPathExpression__Group_1_2__0");
262261
builder.put(grammarAccess.getQueryPathExpressionAccess().getGroup_2(), "rule__QueryPathExpression__Group_2__0");
263262
builder.put(grammarAccess.getQueryPathExpressionAccess().getGroup_2_3(), "rule__QueryPathExpression__Group_2_3__0");
263+
builder.put(grammarAccess.getQueryHeadExpressionAccess().getGroup(), "rule__QueryHeadExpression__Group__0");
264264
builder.put(grammarAccess.getColonQualifiedNameAccess().getGroup(), "rule__ColonQualifiedName__Group__0");
265265
builder.put(grammarAccess.getColonQualifiedNameAccess().getGroup_1(), "rule__ColonQualifiedName__Group_1__0");
266266
builder.put(grammarAccess.getDotQualifiedNameAccess().getGroup(), "rule__DotQualifiedName__Group__0");
@@ -486,10 +486,10 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
486486
builder.put(grammarAccess.getBodyMemberAccess().getOwnedRelatedElementAssignment(), "rule__BodyMember__OwnedRelatedElementAssignment");
487487
builder.put(grammarAccess.getBodyParameterMemberAccess().getMemberNameAssignment_0(), "rule__BodyParameterMember__MemberNameAssignment_0");
488488
builder.put(grammarAccess.getBodyParameterMemberAccess().getOwnedRelatedElementAssignment_1(), "rule__BodyParameterMember__OwnedRelatedElementAssignment_1");
489-
builder.put(grammarAccess.getQueryPathExpressionAccess().getOperandAssignment_1_1(), "rule__QueryPathExpression__OperandAssignment_1_1");
490-
builder.put(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2_2(), "rule__QueryPathExpression__OwnedRelationshipAssignment_1_2_2");
489+
builder.put(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2(), "rule__QueryPathExpression__OwnedRelationshipAssignment_1_2");
491490
builder.put(grammarAccess.getQueryPathExpressionAccess().getOperandAssignment_2_2(), "rule__QueryPathExpression__OperandAssignment_2_2");
492491
builder.put(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_2_3_2(), "rule__QueryPathExpression__OwnedRelationshipAssignment_2_3_2");
492+
builder.put(grammarAccess.getQueryNameExpressionAccess().getOwnedRelationshipAssignment(), "rule__QueryNameExpression__OwnedRelationshipAssignment");
493493
builder.put(grammarAccess.getTypePartAccess().getUnorderedGroup_2(), "rule__TypePart__UnorderedGroup_2");
494494
}
495495
}

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

+92-119
Original file line numberDiff line numberDiff line change
@@ -3371,9 +3371,9 @@ ruleQueryNameExpression
33713371
}
33723372
:
33733373
(
3374-
{ before(grammarAccess.getQueryNameExpressionAccess().getFeatureReferenceExpressionParserRuleCall()); }
3375-
ruleFeatureReferenceExpression
3376-
{ after(grammarAccess.getQueryNameExpressionAccess().getFeatureReferenceExpressionParserRuleCall()); }
3374+
{ before(grammarAccess.getQueryNameExpressionAccess().getOwnedRelationshipAssignment()); }
3375+
(rule__QueryNameExpression__OwnedRelationshipAssignment)
3376+
{ after(grammarAccess.getQueryNameExpressionAccess().getOwnedRelationshipAssignment()); }
33773377
)
33783378
;
33793379
finally {
@@ -3396,9 +3396,9 @@ ruleQueryHeadExpression
33963396
}
33973397
:
33983398
(
3399-
{ before(grammarAccess.getQueryHeadExpressionAccess().getFullStopSolidusKeyword()); }
3400-
'./'
3401-
{ after(grammarAccess.getQueryHeadExpressionAccess().getFullStopSolidusKeyword()); }
3399+
{ before(grammarAccess.getQueryHeadExpressionAccess().getGroup()); }
3400+
(rule__QueryHeadExpression__Group__0)
3401+
{ after(grammarAccess.getQueryHeadExpressionAccess().getGroup()); }
34023402
)
34033403
;
34043404
finally {
@@ -18345,7 +18345,7 @@ rule__QueryPathExpression__Group__1__Impl
1834518345
:
1834618346
(
1834718347
{ before(grammarAccess.getQueryPathExpressionAccess().getGroup_1()); }
18348-
(rule__QueryPathExpression__Group_1__0)
18348+
(rule__QueryPathExpression__Group_1__0)?
1834918349
{ after(grammarAccess.getQueryPathExpressionAccess().getGroup_1()); }
1835018350
)
1835118351
;
@@ -18398,9 +18398,9 @@ rule__QueryPathExpression__Group_1__0__Impl
1839818398
}
1839918399
:
1840018400
(
18401-
{ before(grammarAccess.getQueryPathExpressionAccess().getQueryPathStepExpressionAction_1_0()); }
18402-
()
18403-
{ after(grammarAccess.getQueryPathExpressionAccess().getQueryPathStepExpressionAction_1_0()); }
18401+
{ before(grammarAccess.getQueryPathExpressionAccess().getLeftSquareBracketKeyword_1_0()); }
18402+
'['
18403+
{ after(grammarAccess.getQueryPathExpressionAccess().getLeftSquareBracketKeyword_1_0()); }
1840418404
)
1840518405
;
1840618406
finally {
@@ -18425,9 +18425,9 @@ rule__QueryPathExpression__Group_1__1__Impl
1842518425
}
1842618426
:
1842718427
(
18428-
{ before(grammarAccess.getQueryPathExpressionAccess().getOperandAssignment_1_1()); }
18429-
(rule__QueryPathExpression__OperandAssignment_1_1)
18430-
{ after(grammarAccess.getQueryPathExpressionAccess().getOperandAssignment_1_1()); }
18428+
{ before(grammarAccess.getQueryPathExpressionAccess().getQueryQualifierExpressionOperandAction_1_1()); }
18429+
()
18430+
{ after(grammarAccess.getQueryPathExpressionAccess().getQueryQualifierExpressionOperandAction_1_1()); }
1843118431
)
1843218432
;
1843318433
finally {
@@ -18440,6 +18440,7 @@ rule__QueryPathExpression__Group_1__2
1844018440
}
1844118441
:
1844218442
rule__QueryPathExpression__Group_1__2__Impl
18443+
rule__QueryPathExpression__Group_1__3
1844318444
;
1844418445
finally {
1844518446
restoreStackSize(stackSize);
@@ -18451,117 +18452,35 @@ rule__QueryPathExpression__Group_1__2__Impl
1845118452
}
1845218453
:
1845318454
(
18454-
{ before(grammarAccess.getQueryPathExpressionAccess().getGroup_1_2()); }
18455-
(rule__QueryPathExpression__Group_1_2__0)?
18456-
{ after(grammarAccess.getQueryPathExpressionAccess().getGroup_1_2()); }
18457-
)
18458-
;
18459-
finally {
18460-
restoreStackSize(stackSize);
18461-
}
18462-
18463-
18464-
rule__QueryPathExpression__Group_1_2__0
18465-
@init {
18466-
int stackSize = keepStackSize();
18467-
}
18468-
:
18469-
rule__QueryPathExpression__Group_1_2__0__Impl
18470-
rule__QueryPathExpression__Group_1_2__1
18471-
;
18472-
finally {
18473-
restoreStackSize(stackSize);
18474-
}
18475-
18476-
rule__QueryPathExpression__Group_1_2__0__Impl
18477-
@init {
18478-
int stackSize = keepStackSize();
18479-
}
18480-
:
18481-
(
18482-
{ before(grammarAccess.getQueryPathExpressionAccess().getLeftSquareBracketKeyword_1_2_0()); }
18483-
'['
18484-
{ after(grammarAccess.getQueryPathExpressionAccess().getLeftSquareBracketKeyword_1_2_0()); }
18485-
)
18486-
;
18487-
finally {
18488-
restoreStackSize(stackSize);
18489-
}
18490-
18491-
rule__QueryPathExpression__Group_1_2__1
18492-
@init {
18493-
int stackSize = keepStackSize();
18494-
}
18495-
:
18496-
rule__QueryPathExpression__Group_1_2__1__Impl
18497-
rule__QueryPathExpression__Group_1_2__2
18498-
;
18499-
finally {
18500-
restoreStackSize(stackSize);
18501-
}
18502-
18503-
rule__QueryPathExpression__Group_1_2__1__Impl
18504-
@init {
18505-
int stackSize = keepStackSize();
18506-
}
18507-
:
18508-
(
18509-
{ before(grammarAccess.getQueryPathExpressionAccess().getQueryQualifierExpressionOperandAction_1_2_1()); }
18510-
()
18511-
{ after(grammarAccess.getQueryPathExpressionAccess().getQueryQualifierExpressionOperandAction_1_2_1()); }
18512-
)
18513-
;
18514-
finally {
18515-
restoreStackSize(stackSize);
18516-
}
18517-
18518-
rule__QueryPathExpression__Group_1_2__2
18519-
@init {
18520-
int stackSize = keepStackSize();
18521-
}
18522-
:
18523-
rule__QueryPathExpression__Group_1_2__2__Impl
18524-
rule__QueryPathExpression__Group_1_2__3
18525-
;
18526-
finally {
18527-
restoreStackSize(stackSize);
18528-
}
18529-
18530-
rule__QueryPathExpression__Group_1_2__2__Impl
18531-
@init {
18532-
int stackSize = keepStackSize();
18533-
}
18534-
:
18535-
(
18536-
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2_2()); }
18537-
(rule__QueryPathExpression__OwnedRelationshipAssignment_1_2_2)
18538-
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2_2()); }
18455+
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2()); }
18456+
(rule__QueryPathExpression__OwnedRelationshipAssignment_1_2)
18457+
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipAssignment_1_2()); }
1853918458
)
1854018459
;
1854118460
finally {
1854218461
restoreStackSize(stackSize);
1854318462
}
1854418463

18545-
rule__QueryPathExpression__Group_1_2__3
18464+
rule__QueryPathExpression__Group_1__3
1854618465
@init {
1854718466
int stackSize = keepStackSize();
1854818467
}
1854918468
:
18550-
rule__QueryPathExpression__Group_1_2__3__Impl
18469+
rule__QueryPathExpression__Group_1__3__Impl
1855118470
;
1855218471
finally {
1855318472
restoreStackSize(stackSize);
1855418473
}
1855518474

18556-
rule__QueryPathExpression__Group_1_2__3__Impl
18475+
rule__QueryPathExpression__Group_1__3__Impl
1855718476
@init {
1855818477
int stackSize = keepStackSize();
1855918478
}
1856018479
:
1856118480
(
18562-
{ before(grammarAccess.getQueryPathExpressionAccess().getRightSquareBracketKeyword_1_2_3()); }
18481+
{ before(grammarAccess.getQueryPathExpressionAccess().getRightSquareBracketKeyword_1_3()); }
1856318482
']'
18564-
{ after(grammarAccess.getQueryPathExpressionAccess().getRightSquareBracketKeyword_1_2_3()); }
18483+
{ after(grammarAccess.getQueryPathExpressionAccess().getRightSquareBracketKeyword_1_3()); }
1856518484
)
1856618485
;
1856718486
finally {
@@ -18785,6 +18704,60 @@ finally {
1878518704
}
1878618705

1878718706

18707+
rule__QueryHeadExpression__Group__0
18708+
@init {
18709+
int stackSize = keepStackSize();
18710+
}
18711+
:
18712+
rule__QueryHeadExpression__Group__0__Impl
18713+
rule__QueryHeadExpression__Group__1
18714+
;
18715+
finally {
18716+
restoreStackSize(stackSize);
18717+
}
18718+
18719+
rule__QueryHeadExpression__Group__0__Impl
18720+
@init {
18721+
int stackSize = keepStackSize();
18722+
}
18723+
:
18724+
(
18725+
{ before(grammarAccess.getQueryHeadExpressionAccess().getFullStopSolidusKeyword_0()); }
18726+
'./'
18727+
{ after(grammarAccess.getQueryHeadExpressionAccess().getFullStopSolidusKeyword_0()); }
18728+
)
18729+
;
18730+
finally {
18731+
restoreStackSize(stackSize);
18732+
}
18733+
18734+
rule__QueryHeadExpression__Group__1
18735+
@init {
18736+
int stackSize = keepStackSize();
18737+
}
18738+
:
18739+
rule__QueryHeadExpression__Group__1__Impl
18740+
;
18741+
finally {
18742+
restoreStackSize(stackSize);
18743+
}
18744+
18745+
rule__QueryHeadExpression__Group__1__Impl
18746+
@init {
18747+
int stackSize = keepStackSize();
18748+
}
18749+
:
18750+
(
18751+
{ before(grammarAccess.getQueryHeadExpressionAccess().getFeatureReferenceExpressionParserRuleCall_1()); }
18752+
ruleFeatureReferenceExpression
18753+
{ after(grammarAccess.getQueryHeadExpressionAccess().getFeatureReferenceExpressionParserRuleCall_1()); }
18754+
)
18755+
;
18756+
finally {
18757+
restoreStackSize(stackSize);
18758+
}
18759+
18760+
1878818761
rule__ColonQualifiedName__Group__0
1878918762
@init {
1879018763
int stackSize = keepStackSize();
@@ -22625,60 +22598,60 @@ finally {
2262522598
restoreStackSize(stackSize);
2262622599
}
2262722600

22628-
rule__QueryPathExpression__OperandAssignment_1_1
22601+
rule__QueryPathExpression__OwnedRelationshipAssignment_1_2
2262922602
@init {
2263022603
int stackSize = keepStackSize();
2263122604
}
2263222605
:
2263322606
(
22634-
{ before(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_1_1_0()); }
22635-
ruleQueryNameExpression
22636-
{ after(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_1_1_0()); }
22607+
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_1_2_0()); }
22608+
ruleBodyMember
22609+
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_1_2_0()); }
2263722610
)
2263822611
;
2263922612
finally {
2264022613
restoreStackSize(stackSize);
2264122614
}
2264222615

22643-
rule__QueryPathExpression__OwnedRelationshipAssignment_1_2_2
22616+
rule__QueryPathExpression__OperandAssignment_2_2
2264422617
@init {
2264522618
int stackSize = keepStackSize();
2264622619
}
2264722620
:
2264822621
(
22649-
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_1_2_2_0()); }
22650-
ruleBodyMember
22651-
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_1_2_2_0()); }
22622+
{ before(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_2_2_0()); }
22623+
ruleQueryNameExpression
22624+
{ after(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_2_2_0()); }
2265222625
)
2265322626
;
2265422627
finally {
2265522628
restoreStackSize(stackSize);
2265622629
}
2265722630

22658-
rule__QueryPathExpression__OperandAssignment_2_2
22631+
rule__QueryPathExpression__OwnedRelationshipAssignment_2_3_2
2265922632
@init {
2266022633
int stackSize = keepStackSize();
2266122634
}
2266222635
:
2266322636
(
22664-
{ before(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_2_2_0()); }
22665-
ruleQueryNameExpression
22666-
{ after(grammarAccess.getQueryPathExpressionAccess().getOperandQueryNameExpressionParserRuleCall_2_2_0()); }
22637+
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_2_3_2_0()); }
22638+
ruleBodyMember
22639+
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_2_3_2_0()); }
2266722640
)
2266822641
;
2266922642
finally {
2267022643
restoreStackSize(stackSize);
2267122644
}
2267222645

22673-
rule__QueryPathExpression__OwnedRelationshipAssignment_2_3_2
22646+
rule__QueryNameExpression__OwnedRelationshipAssignment
2267422647
@init {
2267522648
int stackSize = keepStackSize();
2267622649
}
2267722650
:
2267822651
(
22679-
{ before(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_2_3_2_0()); }
22680-
ruleBodyMember
22681-
{ after(grammarAccess.getQueryPathExpressionAccess().getOwnedRelationshipBodyMemberParserRuleCall_2_3_2_0()); }
22652+
{ before(grammarAccess.getQueryNameExpressionAccess().getOwnedRelationshipFeatureReferenceParserRuleCall_0()); }
22653+
ruleFeatureReference
22654+
{ after(grammarAccess.getQueryNameExpressionAccess().getOwnedRelationshipFeatureReferenceParserRuleCall_0()); }
2268222655
)
2268322656
;
2268422657
finally {

0 commit comments

Comments
 (0)