Merge pull request #235 from junfuller/master

Remove scope pruning
dsldevkit · May 23, 2019 · 8a573e9 · 8a573e9
2 parents 2b078cb + c14ca58
commit 8a573e9
Show file tree

Hide file tree

Showing 35 changed files with 4,870 additions and 5,967 deletions.
diff --git a/...-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/AbstractScopeProposalProvider.java b/...-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/AbstractScopeProposalProvider.java
@@ -94,9 +94,6 @@ public void completeScopeContext_ContextType(EObject model, Assignment assignmen
  public void completeScopeContext_Guard(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
  completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
  }
- public void completeScopeExpression_Prune(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
- }
  public void completeFactoryExpression_Expr(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
  completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
  }

diff --git a/...scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/ScopeParser.java b/...scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/ScopeParser.java
@@ -39,7 +39,7 @@ protected String getRuleName(AbstractElement element) {
  {
  put(grammarAccess.getScopeDefinitionAccess().getAlternatives_2(), "rule__ScopeDefinition__Alternatives_2");
  put(grammarAccess.getScopeContextAccess().getAlternatives_0(), "rule__ScopeContext__Alternatives_0");
- put(grammarAccess.getScopeExpressionAccess().getAlternatives_0(), "rule__ScopeExpression__Alternatives_0");
+ put(grammarAccess.getScopeExpressionAccess().getAlternatives(), "rule__ScopeExpression__Alternatives");
  put(grammarAccess.getScopeDelegationAccess().getAlternatives_2(), "rule__ScopeDelegation__Alternatives_2");
  put(grammarAccess.getNamedScopeExpressionAccess().getAlternatives_0(), "rule__NamedScopeExpression__Alternatives_0");
  put(grammarAccess.getGlobalScopeExpressionAccess().getAlternatives_3(), "rule__GlobalScopeExpression__Alternatives_3");
@@ -81,8 +81,6 @@ protected String getRuleName(AbstractElement element) {
  put(grammarAccess.getScopeRuleAccess().getGroup_4(), "rule__ScopeRule__Group_4__0");
  put(grammarAccess.getScopeContextAccess().getGroup(), "rule__ScopeContext__Group__0");
  put(grammarAccess.getScopeContextAccess().getGroup_1(), "rule__ScopeContext__Group_1__0");
- put(grammarAccess.getScopeExpressionAccess().getGroup(), "rule__ScopeExpression__Group__0");
- put(grammarAccess.getScopeExpressionAccess().getGroup_1(), "rule__ScopeExpression__Group_1__0");
  put(grammarAccess.getFactoryExpressionAccess().getGroup(), "rule__FactoryExpression__Group__0");
  put(grammarAccess.getScopeDelegationAccess().getGroup(), "rule__ScopeDelegation__Group__0");
  put(grammarAccess.getScopeDelegationAccess().getGroup_3(), "rule__ScopeDelegation__Group_3__0");
@@ -182,7 +180,6 @@ protected String getRuleName(AbstractElement element) {
  put(grammarAccess.getScopeContextAccess().getGlobalAssignment_0_0(), "rule__ScopeContext__GlobalAssignment_0_0");
  put(grammarAccess.getScopeContextAccess().getContextTypeAssignment_0_1(), "rule__ScopeContext__ContextTypeAssignment_0_1");
  put(grammarAccess.getScopeContextAccess().getGuardAssignment_1_1(), "rule__ScopeContext__GuardAssignment_1_1");
- put(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1(), "rule__ScopeExpression__PruneAssignment_1_1");
  put(grammarAccess.getFactoryExpressionAccess().getExprAssignment_1(), "rule__FactoryExpression__ExprAssignment_1");
  put(grammarAccess.getScopeDelegationAccess().getDelegateAssignment_2_0(), "rule__ScopeDelegation__DelegateAssignment_2_0");
  put(grammarAccess.getScopeDelegationAccess().getExternalAssignment_2_1(), "rule__ScopeDelegation__ExternalAssignment_2_1");

diff --git a/.../src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g b/.../src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g
@@ -325,9 +325,9 @@ ruleScopeExpression
  }
  :
 (
-{ before(grammarAccess.getScopeExpressionAccess().getGroup()); }
-(rule__ScopeExpression__Group__0)
-{ after(grammarAccess.getScopeExpressionAccess().getGroup()); }
+{ before(grammarAccess.getScopeExpressionAccess().getAlternatives()); }
+(rule__ScopeExpression__Alternatives)
+{ after(grammarAccess.getScopeExpressionAccess().getAlternatives()); }
 )
 
 ;
@@ -1775,27 +1775,27 @@ finally {
  restoreStackSize(stackSize);
 }
 
-rule__ScopeExpression__Alternatives_0
+rule__ScopeExpression__Alternatives
  @init {
  int stackSize = keepStackSize();
  }
 :
 (
-{ before(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); }
+{ before(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0()); }
  ruleScopeDelegation
-{ after(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); }
+{ after(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0()); }
 )
 
  |(
-{ before(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); }
+{ before(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_1()); }
  ruleFactoryExpression
-{ after(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); }
+{ after(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_1()); }
 )
 
  |(
-{ before(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); }
+{ before(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_2()); }
  ruleNamedScopeExpression
-{ after(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); }
+{ after(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_2()); }
 )
 
 ;
@@ -4429,130 +4429,6 @@ finally {
 
 
 
-rule__ScopeExpression__Group__0
- @init {
- int stackSize = keepStackSize();
- }
-:
- rule__ScopeExpression__Group__0__Impl
- rule__ScopeExpression__Group__1
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-rule__ScopeExpression__Group__0__Impl
- @init {
- int stackSize = keepStackSize();
- }
-:
-(
-{ before(grammarAccess.getScopeExpressionAccess().getAlternatives_0()); }
-(rule__ScopeExpression__Alternatives_0)
-{ after(grammarAccess.getScopeExpressionAccess().getAlternatives_0()); }
-)
-
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-
-rule__ScopeExpression__Group__1
- @init {
- int stackSize = keepStackSize();
- }
-:
- rule__ScopeExpression__Group__1__Impl
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-rule__ScopeExpression__Group__1__Impl
- @init {
- int stackSize = keepStackSize();
- }
-:
-(
-{ before(grammarAccess.getScopeExpressionAccess().getGroup_1()); }
-(rule__ScopeExpression__Group_1__0)?
-{ after(grammarAccess.getScopeExpressionAccess().getGroup_1()); }
-)
-
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__ScopeExpression__Group_1__0
- @init {
- int stackSize = keepStackSize();
- }
-:
- rule__ScopeExpression__Group_1__0__Impl
- rule__ScopeExpression__Group_1__1
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-rule__ScopeExpression__Group_1__0__Impl
- @init {
- int stackSize = keepStackSize();
- }
-:
-(
-{ before(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); }
-
- '|' 
-
-{ after(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); }
-)
-
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-
-rule__ScopeExpression__Group_1__1
- @init {
- int stackSize = keepStackSize();
- }
-:
- rule__ScopeExpression__Group_1__1__Impl
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-rule__ScopeExpression__Group_1__1__Impl
- @init {
- int stackSize = keepStackSize();
- }
-:
-(
-{ before(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1()); }
-(rule__ScopeExpression__PruneAssignment_1_1)
-{ after(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1()); }
-)
-
-;
-finally {
- restoreStackSize(stackSize);
-}
-
-
-
-
-
-
 rule__FactoryExpression__Group__0
  @init {
  int stackSize = keepStackSize();
@@ -12096,21 +11972,6 @@ finally {
  restoreStackSize(stackSize);
 }
 
-rule__ScopeExpression__PruneAssignment_1_1
- @init {
- int stackSize = keepStackSize();
- }
-:
-(
-{ before(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); }
- ruleExpression{ after(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); }
-)
-
-;
-finally {
- restoreStackSize(stackSize);
-}
-
 rule__FactoryExpression__ExprAssignment_1
  @init {
  int stackSize = keepStackSize();

diff --git a/...gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.tokens b/...gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.tokens
@@ -6,7 +6,7 @@
 ')'=52
 '*'=20
 '+'=18
-','=61
+','=60
 '-'=19
 '->'=71
 '.'=68
@@ -32,33 +32,33 @@
 'case'=47
 'collect'=23
 'context'=54
-'data'=65
+'data'=64
 'default'=77
-'domains'=66
+'domains'=65
 'else'=75
 'exists'=27
 'export'=81
 'extension'=42
-'factory'=59
+'factory'=58
 'false'=32
-'find'=62
+'find'=61
 'forAll'=30
 'if'=73
 'implies'=84
 'import'=40
 'inject'=43
 'insensitive'=37
-'key'=63
+'key'=62
 'let'=69
 'naming'=44
 'new'=79
 'notExists'=28
 'null'=86
-'prefix'=64
+'prefix'=63
 'recursive'=80
 'reject'=26
 'scope'=50
-'scopeof'=60
+'scopeof'=59
 'scoping'=38
 'select'=24
 'selectFirst'=25
@@ -70,7 +70,7 @@
 'typeSelect'=85
 'with'=39
 '{'=45
-'|'=58
+'|'=66
 '||'=82
 '}'=46
 RULE_ANY_OTHER=11