Skip to content

Commit 8a573e9

Browse files
junfullerjunfuller
authored
Merge pull request #235 from junfuller/master
Remove scope pruning
2 parents 2b078cb + c14ca58 commit 8a573e9

35 files changed

+4870
-5967
lines changed

‎com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/AbstractScopeProposalProvider.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ public void completeScopeContext_ContextType(EObject model, Assignment assignmen
9494
public void completeScopeContext_Guard(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
9595
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
9696
}
97-
public void completeScopeExpression_Prune(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
98-
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
99-
}
10097
public void completeFactoryExpression_Expr(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
10198
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
10299
}

‎com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/ScopeParser.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected String getRuleName(AbstractElement element) {
3939
{
4040
put(grammarAccess.getScopeDefinitionAccess().getAlternatives_2(), "rule__ScopeDefinition__Alternatives_2");
4141
put(grammarAccess.getScopeContextAccess().getAlternatives_0(), "rule__ScopeContext__Alternatives_0");
42-
put(grammarAccess.getScopeExpressionAccess().getAlternatives_0(), "rule__ScopeExpression__Alternatives_0");
42+
put(grammarAccess.getScopeExpressionAccess().getAlternatives(), "rule__ScopeExpression__Alternatives");
4343
put(grammarAccess.getScopeDelegationAccess().getAlternatives_2(), "rule__ScopeDelegation__Alternatives_2");
4444
put(grammarAccess.getNamedScopeExpressionAccess().getAlternatives_0(), "rule__NamedScopeExpression__Alternatives_0");
4545
put(grammarAccess.getGlobalScopeExpressionAccess().getAlternatives_3(), "rule__GlobalScopeExpression__Alternatives_3");
@@ -81,8 +81,6 @@ protected String getRuleName(AbstractElement element) {
8181
put(grammarAccess.getScopeRuleAccess().getGroup_4(), "rule__ScopeRule__Group_4__0");
8282
put(grammarAccess.getScopeContextAccess().getGroup(), "rule__ScopeContext__Group__0");
8383
put(grammarAccess.getScopeContextAccess().getGroup_1(), "rule__ScopeContext__Group_1__0");
84-
put(grammarAccess.getScopeExpressionAccess().getGroup(), "rule__ScopeExpression__Group__0");
85-
put(grammarAccess.getScopeExpressionAccess().getGroup_1(), "rule__ScopeExpression__Group_1__0");
8684
put(grammarAccess.getFactoryExpressionAccess().getGroup(), "rule__FactoryExpression__Group__0");
8785
put(grammarAccess.getScopeDelegationAccess().getGroup(), "rule__ScopeDelegation__Group__0");
8886
put(grammarAccess.getScopeDelegationAccess().getGroup_3(), "rule__ScopeDelegation__Group_3__0");
@@ -182,7 +180,6 @@ protected String getRuleName(AbstractElement element) {
182180
put(grammarAccess.getScopeContextAccess().getGlobalAssignment_0_0(), "rule__ScopeContext__GlobalAssignment_0_0");
183181
put(grammarAccess.getScopeContextAccess().getContextTypeAssignment_0_1(), "rule__ScopeContext__ContextTypeAssignment_0_1");
184182
put(grammarAccess.getScopeContextAccess().getGuardAssignment_1_1(), "rule__ScopeContext__GuardAssignment_1_1");
185-
put(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1(), "rule__ScopeExpression__PruneAssignment_1_1");
186183
put(grammarAccess.getFactoryExpressionAccess().getExprAssignment_1(), "rule__FactoryExpression__ExprAssignment_1");
187184
put(grammarAccess.getScopeDelegationAccess().getDelegateAssignment_2_0(), "rule__ScopeDelegation__DelegateAssignment_2_0");
188185
put(grammarAccess.getScopeDelegationAccess().getExternalAssignment_2_1(), "rule__ScopeDelegation__ExternalAssignment_2_1");

‎com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g‎

Lines changed: 10 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ ruleScopeExpression
325325
}
326326
:
327327
(
328-
{ before(grammarAccess.getScopeExpressionAccess().getGroup()); }
329-
(rule__ScopeExpression__Group__0)
330-
{ after(grammarAccess.getScopeExpressionAccess().getGroup()); }
328+
{ before(grammarAccess.getScopeExpressionAccess().getAlternatives()); }
329+
(rule__ScopeExpression__Alternatives)
330+
{ after(grammarAccess.getScopeExpressionAccess().getAlternatives()); }
331331
)
332332

333333
;
@@ -1775,27 +1775,27 @@ finally {
17751775
restoreStackSize(stackSize);
17761776
}
17771777

1778-
rule__ScopeExpression__Alternatives_0
1778+
rule__ScopeExpression__Alternatives
17791779
@init {
17801780
int stackSize = keepStackSize();
17811781
}
17821782
:
17831783
(
1784-
{ before(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); }
1784+
{ before(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0()); }
17851785
ruleScopeDelegation
1786-
{ after(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); }
1786+
{ after(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0()); }
17871787
)
17881788

17891789
|(
1790-
{ before(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); }
1790+
{ before(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_1()); }
17911791
ruleFactoryExpression
1792-
{ after(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); }
1792+
{ after(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_1()); }
17931793
)
17941794

17951795
|(
1796-
{ before(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); }
1796+
{ before(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_2()); }
17971797
ruleNamedScopeExpression
1798-
{ after(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); }
1798+
{ after(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_2()); }
17991799
)
18001800

18011801
;
@@ -4429,130 +4429,6 @@ finally {
44294429

44304430

44314431

4432-
rule__ScopeExpression__Group__0
4433-
@init {
4434-
int stackSize = keepStackSize();
4435-
}
4436-
:
4437-
rule__ScopeExpression__Group__0__Impl
4438-
rule__ScopeExpression__Group__1
4439-
;
4440-
finally {
4441-
restoreStackSize(stackSize);
4442-
}
4443-
4444-
rule__ScopeExpression__Group__0__Impl
4445-
@init {
4446-
int stackSize = keepStackSize();
4447-
}
4448-
:
4449-
(
4450-
{ before(grammarAccess.getScopeExpressionAccess().getAlternatives_0()); }
4451-
(rule__ScopeExpression__Alternatives_0)
4452-
{ after(grammarAccess.getScopeExpressionAccess().getAlternatives_0()); }
4453-
)
4454-
4455-
;
4456-
finally {
4457-
restoreStackSize(stackSize);
4458-
}
4459-
4460-
4461-
rule__ScopeExpression__Group__1
4462-
@init {
4463-
int stackSize = keepStackSize();
4464-
}
4465-
:
4466-
rule__ScopeExpression__Group__1__Impl
4467-
;
4468-
finally {
4469-
restoreStackSize(stackSize);
4470-
}
4471-
4472-
rule__ScopeExpression__Group__1__Impl
4473-
@init {
4474-
int stackSize = keepStackSize();
4475-
}
4476-
:
4477-
(
4478-
{ before(grammarAccess.getScopeExpressionAccess().getGroup_1()); }
4479-
(rule__ScopeExpression__Group_1__0)?
4480-
{ after(grammarAccess.getScopeExpressionAccess().getGroup_1()); }
4481-
)
4482-
4483-
;
4484-
finally {
4485-
restoreStackSize(stackSize);
4486-
}
4487-
4488-
4489-
4490-
4491-
4492-
4493-
rule__ScopeExpression__Group_1__0
4494-
@init {
4495-
int stackSize = keepStackSize();
4496-
}
4497-
:
4498-
rule__ScopeExpression__Group_1__0__Impl
4499-
rule__ScopeExpression__Group_1__1
4500-
;
4501-
finally {
4502-
restoreStackSize(stackSize);
4503-
}
4504-
4505-
rule__ScopeExpression__Group_1__0__Impl
4506-
@init {
4507-
int stackSize = keepStackSize();
4508-
}
4509-
:
4510-
(
4511-
{ before(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); }
4512-
4513-
'|'
4514-
4515-
{ after(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); }
4516-
)
4517-
4518-
;
4519-
finally {
4520-
restoreStackSize(stackSize);
4521-
}
4522-
4523-
4524-
rule__ScopeExpression__Group_1__1
4525-
@init {
4526-
int stackSize = keepStackSize();
4527-
}
4528-
:
4529-
rule__ScopeExpression__Group_1__1__Impl
4530-
;
4531-
finally {
4532-
restoreStackSize(stackSize);
4533-
}
4534-
4535-
rule__ScopeExpression__Group_1__1__Impl
4536-
@init {
4537-
int stackSize = keepStackSize();
4538-
}
4539-
:
4540-
(
4541-
{ before(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1()); }
4542-
(rule__ScopeExpression__PruneAssignment_1_1)
4543-
{ after(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1()); }
4544-
)
4545-
4546-
;
4547-
finally {
4548-
restoreStackSize(stackSize);
4549-
}
4550-
4551-
4552-
4553-
4554-
4555-
45564432
rule__FactoryExpression__Group__0
45574433
@init {
45584434
int stackSize = keepStackSize();
@@ -12096,21 +11972,6 @@ finally {
1209611972
restoreStackSize(stackSize);
1209711973
}
1209811974

12099-
rule__ScopeExpression__PruneAssignment_1_1
12100-
@init {
12101-
int stackSize = keepStackSize();
12102-
}
12103-
:
12104-
(
12105-
{ before(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); }
12106-
ruleExpression{ after(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); }
12107-
)
12108-
12109-
;
12110-
finally {
12111-
restoreStackSize(stackSize);
12112-
}
12113-
1211411975
rule__FactoryExpression__ExprAssignment_1
1211511976
@init {
1211611977
int stackSize = keepStackSize();

‎com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.tokens‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
')'=52
77
'*'=20
88
'+'=18
9-
','=61
9+
','=60
1010
'-'=19
1111
'->'=71
1212
'.'=68
@@ -32,33 +32,33 @@
3232
'case'=47
3333
'collect'=23
3434
'context'=54
35-
'data'=65
35+
'data'=64
3636
'default'=77
37-
'domains'=66
37+
'domains'=65
3838
'else'=75
3939
'exists'=27
4040
'export'=81
4141
'extension'=42
42-
'factory'=59
42+
'factory'=58
4343
'false'=32
44-
'find'=62
44+
'find'=61
4545
'forAll'=30
4646
'if'=73
4747
'implies'=84
4848
'import'=40
4949
'inject'=43
5050
'insensitive'=37
51-
'key'=63
51+
'key'=62
5252
'let'=69
5353
'naming'=44
5454
'new'=79
5555
'notExists'=28
5656
'null'=86
57-
'prefix'=64
57+
'prefix'=63
5858
'recursive'=80
5959
'reject'=26
6060
'scope'=50
61-
'scopeof'=60
61+
'scopeof'=59
6262
'scoping'=38
6363
'select'=24
6464
'selectFirst'=25
@@ -70,7 +70,7 @@
7070
'typeSelect'=85
7171
'with'=39
7272
'{'=45
73-
'|'=58
73+
'|'=66
7474
'||'=82
7575
'}'=46
7676
RULE_ANY_OTHER=11

0 commit comments

Comments
 (0)