From 96d44d87a9eb2e5a5eefc1ced3e5d2e714746a43 Mon Sep 17 00:00:00 2001 From: Arne Deutsch Date: Fri, 4 Dec 2020 09:43:25 +0100 Subject: [PATCH 1/2] [#1625] More formatter fixes and tests. Signed-off-by: Arne Deutsch --- .../internal/JavaFormatterGrammarTest.java | 111 ++++++++++++++++++ .../xtext/xtext/GrammarFlatteningTest.xtend | 12 +- .../xtext/xtext/GrammarFlatteningTest.java | 12 +- .../xtext/xtext/XtextFormatterJava.java | 40 +++++-- 4 files changed, 151 insertions(+), 24 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/JavaFormatterGrammarTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/JavaFormatterGrammarTest.java index e5431b43b..f474096e2 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/JavaFormatterGrammarTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/JavaFormatterGrammarTest.java @@ -121,6 +121,23 @@ public class JavaFormatterGrammarTest extends AbstractXtextTests { // @formatter:on } + @Test + public void unorderedGroups2() { + // @formatter:off + assertFormattedGrammar( + "CopyFieldNameToVariableStmt:" + NL + + " 'FIELD-NAME-TO-VARIABLE' ( ( ',' 'SCREEN' '=' '(' line=INT ',' column=INT ')' ) & " + NL + + " ( ',' 'VAR' '=' name=ID ) & " + NL + + " ( ',' 'TYPE' '=' 'REPLACE' ) ? ) ;" + , + "CopyFieldNameToVariableStmt:" + NL + + TAB + "'FIELD-NAME-TO-VARIABLE' ((',' 'SCREEN' '=' '(' line=INT ',' column=INT ')') &" + NL + + TAB + "(',' 'VAR' '=' name=ID) &" + NL + + TAB + "(',' 'TYPE' '=' 'REPLACE')?);" + ); + // @formatter:on + } + @Test public void guardExpressions() { // @formatter:off @@ -398,6 +415,100 @@ public class JavaFormatterGrammarTest extends AbstractXtextTests { // @formatter:on } + @Test + public void predicatedKeyword0() { + // @formatter:off + assertFormattedGrammar( + "Rule:" + NL + + TAB + "( -> 'a')?;" + , + "Rule:" + NL + + TAB + "(->'a')?;" + ); + // @formatter:on + } + + @Test + public void predicatedKeyword1() { + // @formatter:off + assertFormattedGrammar( + "Rule:" + NL + + TAB + "( => 'a')?;" + , + "Rule:" + NL + + TAB + "(=>'a')?;" + ); + // @formatter:on + } + + @Test + public void predicatedKeyword3() { + // @formatter:off + assertFormattedGrammar( + "Rule:" + NL + + TAB + "{XReturnExpression} 'return' -> expression=XExpression?;" + , + "Rule:" + NL + + TAB + "{XReturnExpression} 'return' ->expression=XExpression?;" + ); + // @formatter:on + } + + @Test + public void bug287941TestLanguageGrammarAccess() { + // @formatter:off + assertFormattedGrammar( + "AndWhereEntry returns WhereEntry:" + NL + + " ConcreteWhereEntry ({AndWhereEntry.entries += current}" + NL + + " (\"and\" entries+=ConcreteWhereEntry)+)?;" + , + "AndWhereEntry returns WhereEntry:" + NL + + TAB + "ConcreteWhereEntry ({AndWhereEntry.entries+=current}" + NL + + TAB + "(\"and\" entries+=ConcreteWhereEntry)+)?;" + ); + // @formatter:on + } + + @Test + public void untilToken() { + // @formatter:off + assertFormattedGrammar( + "terminal RULE_ML_COMMENT:" + NL + + " \"/*\"->\"*/\";" + , + "terminal RULE_ML_COMMENT:" + NL + + TAB + "\"/*\"->\"*/\";" + ); + // @formatter:on + } + + @Test + public void beeLanguage() { + // @formatter:off + assertFormattedGrammar( + "ProvidedCapability: {ProvidedCapability}" + NL + + " ((nameSpace=ID) | \"unit\") " + NL + + " ('{'" + NL + + " ( " + NL + + " ('when' ':' condExpr = Expression ';')?" + NL + + " & (\"name\" ':' name = ID ';') " + NL + + " & (\"version\" ':' version = ID ';')?" + NL + + " )" + NL + + " '}')?" + NL + + ";" + NL + + "" + , + "ProvidedCapability:" + NL + + TAB + "{ProvidedCapability}" + NL + + TAB + "((nameSpace=ID) | \"unit\")" + NL + + TAB + "('{'" + NL + + TAB + "(('when' ':' condExpr=Expression ';')? & (\"name\" ':' name=ID ';') & (\"version\" ':' version=ID ';')?)" + NL + + TAB + "'}')?;" + NL + + "" + ); + // @formatter:on + } + private void assertFormattedGrammar(String input, String expectation) { assertFormatted("grammar a.A" + NL + NL + input, "grammar a.A" + NL + NL + expectation); } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend index fc07ecc35..bdc2e0717 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/GrammarFlatteningTest.xtend @@ -426,8 +426,8 @@ class GrammarFlatteningTest extends AbstractXtextTests { grammar com.foo.bar hidden(RULE_WS, RULE_ML_COMMENT, RULE_SL_COMMENT) ruleParserRuleParameters: - {ParserRuleParameters} ("#1" scenario=norm1_Scenario1 | "#2" scenario=ruleScenario1 | "#3" scenario=norm1_Scenario2 | - "#4" scenario=ruleScenario2 | => ("#5" scenario=norm1_Scenario2) | => ("#6" scenario=ruleScenario2) | "#7" + {ParserRuleParameters} ("#1" scenario=norm1_Scenario1 | "#2" scenario=ruleScenario1 | "#3" scenario=norm1_Scenario2 + | "#4" scenario=ruleScenario2 | => ("#5" scenario=norm1_Scenario2) | => ("#6" scenario=ruleScenario2) | "#7" scenario=norm1_Scenario3 | "#8" scenario=ruleScenario3 | "#9" (scenario=norm1_Scenario4 | scenario=norm1_Scenario2 "keyword"?) | "#10" (scenario=norm1_Scenario4 | scenario=ruleScenario2 "keyword"?) | "#11" (scenario=ruleScenario4 | scenario=norm1_Scenario2 "keyword"?) | "#12" (scenario=ruleScenario4 | scenario=ruleScenario2 "keyword"?)); @@ -445,16 +445,16 @@ class GrammarFlatteningTest extends AbstractXtextTests { first=norm1_IdOrKeyword; ruleScenario3: - => first=ruleIdOrKeyword | second="keyword"; + =>first=ruleIdOrKeyword | second="keyword"; norm1_Scenario3: - => first=norm1_IdOrKeyword | second="keyword"; + =>first=norm1_IdOrKeyword | second="keyword"; ruleScenario4: - => second=ruleIdOrKeyword "keyword"; + =>second=ruleIdOrKeyword "keyword"; norm1_Scenario4: - => second=norm1_IdOrKeyword "keyword"; + =>second=norm1_IdOrKeyword "keyword"; ruleIdOrKeyword: RULE_ID; diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/xtext/GrammarFlatteningTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/xtext/GrammarFlatteningTest.java index 8b3c6c75b..3db384786 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/xtext/GrammarFlatteningTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/xtext/GrammarFlatteningTest.java @@ -769,10 +769,10 @@ public class GrammarFlatteningTest extends AbstractXtextTests { _builder_1.append("ruleParserRuleParameters:"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("{ParserRuleParameters} (\"#1\" scenario=norm1_Scenario1 | \"#2\" scenario=ruleScenario1 | \"#3\" scenario=norm1_Scenario2 |"); + _builder_1.append("{ParserRuleParameters} (\"#1\" scenario=norm1_Scenario1 | \"#2\" scenario=ruleScenario1 | \"#3\" scenario=norm1_Scenario2"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("\"#4\" scenario=ruleScenario2 | => (\"#5\" scenario=norm1_Scenario2) | => (\"#6\" scenario=ruleScenario2) | \"#7\""); + _builder_1.append("| \"#4\" scenario=ruleScenario2 | => (\"#5\" scenario=norm1_Scenario2) | => (\"#6\" scenario=ruleScenario2) | \"#7\""); _builder_1.newLine(); _builder_1.append("\t"); _builder_1.append("scenario=norm1_Scenario3 | \"#8\" scenario=ruleScenario3 | \"#9\" (scenario=norm1_Scenario4 | scenario=norm1_Scenario2"); @@ -811,25 +811,25 @@ public class GrammarFlatteningTest extends AbstractXtextTests { _builder_1.append("ruleScenario3:"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("=> first=ruleIdOrKeyword | second=\"keyword\";"); + _builder_1.append("=>first=ruleIdOrKeyword | second=\"keyword\";"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("norm1_Scenario3:"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("=> first=norm1_IdOrKeyword | second=\"keyword\";"); + _builder_1.append("=>first=norm1_IdOrKeyword | second=\"keyword\";"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("ruleScenario4:"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("=> second=ruleIdOrKeyword \"keyword\";"); + _builder_1.append("=>second=ruleIdOrKeyword \"keyword\";"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("norm1_Scenario4:"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("=> second=norm1_IdOrKeyword \"keyword\";"); + _builder_1.append("=>second=norm1_IdOrKeyword \"keyword\";"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("ruleIdOrKeyword:"); diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatterJava.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatterJava.java index d0f074aae..46491f362 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatterJava.java +++ b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextFormatterJava.java @@ -92,14 +92,14 @@ public class XtextFormatterJava extends AbstractJavaFormatter { }); formatParens(alternatives, doc); formatCardinality(alternatives, doc); - for (AbstractElement element : alternatives.getElements()) - doc.format(element); + formatGroupElements(alternatives, doc); } protected void format(Assignment assignment, IFormattableDocument doc) { regionFor(assignment).keywords("=", "+=", "?=").forEach(r -> doc.surround(r, it -> it.noSpace())); - formatCardinality(assignment, doc); + regionFor(assignment).keywords("->", "=>").forEach(k -> doc.append(k, it -> it.noSpace())); formatParens(assignment, doc); + formatCardinality(assignment, doc); doc.format(assignment.getTerminal()); } @@ -107,23 +107,26 @@ public class XtextFormatterJava extends AbstractJavaFormatter { doc.append(regionFor(group).keyword("<"), it -> it.noSpace()); doc.format(group.getGuardCondition()); doc.prepend(regionFor(group).keyword(">"), it -> it.noSpace()); - formatCardinality(group, doc); formatParens(group, doc); + formatCardinality(group, doc); formatGroupElements(group, doc); } protected void format(UnorderedGroup group, IFormattableDocument doc) { - doc.append(regionFor(group).keyword("&"), it -> it.oneSpace()); + regionFor(group).keywords("&").forEach(r -> doc.surround(r, it -> it.oneSpace())); + formatParens(group, doc); formatGroupElements(group, doc); } protected void format(Conjunction conjunction, IFormattableDocument doc) { regionFor(conjunction).keywords("&").forEach(r -> doc.surround(r, it -> it.oneSpace())); + formatParens(conjunction, doc); doc.format(conjunction.getRight()); } protected void format(Disjunction disjunction, IFormattableDocument doc) { regionFor(disjunction).keywords("|").forEach(r -> doc.surround(r, it -> it.oneSpace())); + formatParens(disjunction, doc); doc.format(disjunction.getRight()); } @@ -133,6 +136,7 @@ public class XtextFormatterJava extends AbstractJavaFormatter { protected void format(CharacterRange range, IFormattableDocument doc) { doc.surround(regionFor(range).keyword(".."), it -> it.noSpace()); + formatParens(range, doc); formatCardinality(range, doc); doc.format(range.getLeft()); doc.format(range.getRight()); @@ -144,12 +148,15 @@ public class XtextFormatterJava extends AbstractJavaFormatter { doc.prepend(regionFor(call).keyword(">"), it -> it.noSpace()); regionFor(call).keywords(",").forEach(r -> doc.prepend(r, it -> it.noSpace())); regionFor(call).keywords(",").forEach(r -> doc.append(r, it -> it.oneSpace())); + formatParens(call, doc); formatCardinality(call, doc); call.getArguments().forEach(a -> doc.format(a)); } protected void format(Keyword keyword, IFormattableDocument doc) { doc.surround(keyword, it -> it.autowrap()); + regionFor(keyword).keywords("->", "=>").forEach(k -> doc.append(k, it -> it.noSpace())); + formatParens(keyword, doc); formatCardinality(keyword, doc); } @@ -171,7 +178,7 @@ public class XtextFormatterJava extends AbstractJavaFormatter { doc.prepend(regionFor(action).keyword("}"), it -> it.noSpace()); doc.append(regionFor(action).keyword("}"), it -> it.autowrap()); doc.surround(regionFor(action).keyword("."), it -> it.noSpace()); - doc.surround(regionFor(action).keyword("="), it -> it.noSpace()); + regionFor(action).keywords("=", "+=").forEach(k -> doc.surround(k, it -> it.noSpace())); doc.format(action.getType()); } @@ -202,13 +209,18 @@ public class XtextFormatterJava extends AbstractJavaFormatter { boolean first = true; EList elements = group.getElements(); int size = elements.size(); - int index = 0; - for (AbstractElement element : elements) { - index++; - boolean last = index == size; - if (!first && !last) { + for (int index = 0; index < elements.size(); index++) { + boolean last = index + 1 == size; + AbstractElement element = elements.get(index); + AbstractElement next = null; + if (!last) + next = elements.get(index + 1); + if (first && !last) { + if (elementsAreSeperatedBySpace(element, next)) + doc.append(element, it -> it.oneSpace()); + } else if (!first && !last) { doc.prepend(element, it -> it.setNewLines(0, 0, 1)); - if (!(element instanceof UntilToken) && !(element instanceof Group)) + if (elementsAreSeperatedBySpace(element, next)) doc.surround(element, it -> it.oneSpace()); } else if (!first && last) { doc.prepend(element, it -> it.setNewLines(0, 0, 1)); @@ -218,6 +230,10 @@ public class XtextFormatterJava extends AbstractJavaFormatter { } } + private boolean elementsAreSeperatedBySpace(AbstractElement element, AbstractElement next) { + return !(element instanceof UntilToken || element instanceof Group || next instanceof UntilToken); + } + private void formatRule(AbstractRule rule, IFormattableDocument doc) { doc.surround(regionFor(rule).keyword("returns"), it -> it.oneSpace()); doc.prepend(regionFor(rule).keyword("hidden"), it -> it.oneSpace()); From d16c16c9163ce4f61ea7d1145d9011ab7892a6cf Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 11 Dec 2020 09:47:18 +0100 Subject: [PATCH 2/2] Regenerated Languages Signed-off-by: Christian Dietrich --- .../services/TestLanguageGrammarAccess.java | 8 +- .../BeeLangTestLanguageGrammarAccess.java | 159 ++++------ .../ExBeeLangTestLanguageGrammarAccess.java | 37 +-- ...impleBeeLangTestLanguageGrammarAccess.java | 37 +-- ...XtextGrammarTestLanguageGrammarAccess.java | 70 ++--- .../EpatchTestLanguageGrammarAccess.java | 8 +- .../ParametersTestLanguageGrammarAccess.java | 4 +- ...woParametersTestLanguageGrammarAccess.java | 7 +- ...extTerminalsTestLanguageGrammarAccess.java | 60 ++-- ...ingBug325745TestLanguageGrammarAccess.java | 10 +- ...ingBug325745TestLanguageGrammarAccess.java | 2 +- ...rderedGroupsTestLanguageGrammarAccess.java | 38 +-- ...ingBug325745TestLanguageGrammarAccess.java | 2 +- ...rderedGroupsTestLanguageGrammarAccess.java | 38 +-- ...rderedGroupsTestLanguageGrammarAccess.java | 274 +++++++++--------- ...plexReconstrTestLanguageGrammarAccess.java | 16 +- .../SequencerTestLanguageGrammarAccess.java | 24 +- ...XtextGrammarTestLanguageGrammarAccess.java | 80 ++--- .../ActionTestLanguage2GrammarAccess.java | 10 +- ...eExpressionsTestLanguageGrammarAccess.java | 30 +- .../services/TestLanguageGrammarAccess.java | 10 +- .../xtext/services/XtextGrammarAccess.java | 6 +- 22 files changed, 426 insertions(+), 504 deletions(-) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java index 7278035e8..d028edc10 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java @@ -227,10 +227,10 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra private final Keyword cRightSquareBracketKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1); //Type: - // (TypeReference | PrimitiveType) (arrayDiemensions+='['']')*; + // (TypeReference | PrimitiveType) (arrayDiemensions+='[' ']')*; @Override public ParserRule getRule() { return rule; } - //(TypeReference | PrimitiveType) (arrayDiemensions+='['']')* + //(TypeReference | PrimitiveType) (arrayDiemensions+='[' ']')* public Group getGroup() { return cGroup; } //(TypeReference | PrimitiveType) @@ -242,7 +242,7 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra //PrimitiveType public RuleCall getPrimitiveTypeParserRuleCall_0_1() { return cPrimitiveTypeParserRuleCall_0_1; } - //(arrayDiemensions+='['']')* + //(arrayDiemensions+='[' ']')* public Group getGroup_1() { return cGroup_1; } //arrayDiemensions+='[' @@ -656,7 +656,7 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra } //Type: - // (TypeReference | PrimitiveType) (arrayDiemensions+='['']')*; + // (TypeReference | PrimitiveType) (arrayDiemensions+='[' ']')*; public TypeElements getTypeAccess() { return pType; } diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java index cef906aa6..b6ef7ee54 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java @@ -115,25 +115,17 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //Unit: // {Unit} documentation=DOCUMENTATION? // 'unit' name=ID? ('version' version=ID)? ('implements' implements+=SimpleTypeRef (',' implements+=SimpleTypeRef)*)? - // '{' ( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + // '{' (('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + // providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';' + // )* & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) // '}'; @Override public ParserRule getRule() { return rule; } //{Unit} documentation=DOCUMENTATION? //'unit' name=ID? ('version' version=ID)? ('implements' implements+=SimpleTypeRef (',' implements+=SimpleTypeRef)*)? - //'{' ( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + //'{' (('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + //providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* & + //('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) //'}' public Group getGroup() { return cGroup; } @@ -194,13 +186,9 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //'{' public Keyword getLeftCurlyBracketKeyword_6() { return cLeftCurlyBracketKeyword_6; } - //( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + //(('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + //providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* & + //('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) public UnorderedGroup getUnorderedGroup_7() { return cUnorderedGroup_7; } //('source' ':' sourceLocation=Path ';')? @@ -337,15 +325,13 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst private final Keyword cRightCurlyBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2); //ProvidedCapability: - // {ProvidedCapability} (nameSpace=ID | "unit") ('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + // {ProvidedCapability} (nameSpace=ID | "unit") ('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & + // ("version" ':' version=ID ';')?) // '}')?; @Override public ParserRule getRule() { return rule; } - //{ProvidedCapability} (nameSpace=ID | "unit") ('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + //{ProvidedCapability} (nameSpace=ID | "unit") ('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & ( + //"version" ':' version=ID ';')?) //'}')? public Group getGroup() { return cGroup; } @@ -364,18 +350,14 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //"unit" public Keyword getUnitKeyword_1_1() { return cUnitKeyword_1_1; } - //('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + //('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & ("version" ':' version=ID ';')?) //'}')? public Group getGroup_2() { return cGroup_2; } //'{' public Keyword getLeftCurlyBracketKeyword_2_0() { return cLeftCurlyBracketKeyword_2_0; } - //( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + //(('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & ("version" ':' version=ID ';')?) public UnorderedGroup getUnorderedGroup_2_1() { return cUnorderedGroup_2_1; } //('when' ':' condExpr=Expression ';')? @@ -482,21 +464,13 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2); //AliasedRequiredCapability: - // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';') + // ? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) // '}'); @Override public ParserRule getRule() { return rule; } - //(nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //(nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';')? & + //("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) //'}') public Group getGroup() { return cGroup; } @@ -530,24 +504,16 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //ID public RuleCall getAliasIDTerminalRuleCall_2_1_0() { return cAliasIDTerminalRuleCall_2_1_0; } - //('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';')? & ("requires-min" ':' min=INT ';')? & ( + //"requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) //'}') public Group getGroup_3() { return cGroup_3; } //'{' public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; } - //( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //(('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" + //':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) public UnorderedGroup getUnorderedGroup_3_1() { return cUnorderedGroup_3_1; } //('when' ':' condExpr=Expression ';')? @@ -681,21 +647,14 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2); //RequiredCapability: - // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" + // ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')? + // ) // '}'); @Override public ParserRule getRule() { return rule; } - //{RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //{RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';' + //)? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) //'}') public Group getGroup() { return cGroup; } @@ -720,24 +679,16 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //ID public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; } - //('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';')? & ("requires-min" ':' min=INT ';')? & ( + //"requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) //'}') public Group getGroup_3() { return cGroup_3; } //'{' public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; } - //( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + //(('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" + //':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) public UnorderedGroup getUnorderedGroup_3_1() { return cUnorderedGroup_3_1; } //('when' ':' condExpr=Expression ';')? @@ -2906,13 +2857,14 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst private final RuleCall cFuncExprOneOrManyExpressionsParserRuleCall_4_0 = (RuleCall)cFuncExprAssignment_4.eContents().get(0); //ClosureExpression Expression: - // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration) - // * (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? + // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' + // parameters+=ParameterDeclaration)* (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." + // parameters+=ParameterDeclaration)? // '|' funcExpr=OneOrManyExpressions; @Override public ParserRule getRule() { return rule; } - //{Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration)* ( - //',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? + //{Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration)* + //(',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? //'|' funcExpr=OneOrManyExpressions public Group getGroup() { return cGroup; } @@ -3331,13 +3283,9 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst //Unit: // {Unit} documentation=DOCUMENTATION? // 'unit' name=ID? ('version' version=ID)? ('implements' implements+=SimpleTypeRef (',' implements+=SimpleTypeRef)*)? - // '{' ( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + // '{' (('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + // providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';' + // )* & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) // '}'; public UnitElements getUnitAccess() { return pUnit; @@ -3348,9 +3296,8 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst } //ProvidedCapability: - // {ProvidedCapability} (nameSpace=ID | "unit") ('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + // {ProvidedCapability} (nameSpace=ID | "unit") ('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & + // ("version" ':' version=ID ';')?) // '}')?; public ProvidedCapabilityElements getProvidedCapabilityAccess() { return pProvidedCapability; @@ -3361,12 +3308,8 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst } //AliasedRequiredCapability: - // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';') + // ? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) // '}'); public AliasedRequiredCapabilityElements getAliasedRequiredCapabilityAccess() { return pAliasedRequiredCapability; @@ -3377,12 +3320,9 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst } //RequiredCapability: - // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" + // ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')? + // ) // '}'); public RequiredCapabilityElements getRequiredCapabilityAccess() { return pRequiredCapability; @@ -3885,8 +3825,9 @@ public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Abst } //ClosureExpression Expression: - // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration) - // * (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? + // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' + // parameters+=ParameterDeclaration)* (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." + // parameters+=ParameterDeclaration)? // '|' funcExpr=OneOrManyExpressions; public ClosureExpressionElements getClosureExpressionAccess() { return pClosureExpression; diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java index 0f4361369..e6e4a1ce8 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java @@ -105,13 +105,9 @@ public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Ab //Unit: // {Unit} documentation=DOCUMENTATION? // 'unit' name=ID? ('version' version=ID)? ('implements' implements+=SimpleTypeRef (',' implements+=SimpleTypeRef)*)? - // '{' ( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + // '{' (('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + // providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';' + // )* & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) // '}'; public BeeLangTestLanguageGrammarAccess.UnitElements getUnitAccess() { return gaBeeLangTestLanguage.getUnitAccess(); @@ -122,9 +118,8 @@ public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //ProvidedCapability: - // {ProvidedCapability} (nameSpace=ID | "unit") ('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + // {ProvidedCapability} (nameSpace=ID | "unit") ('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & + // ("version" ':' version=ID ';')?) // '}')?; public BeeLangTestLanguageGrammarAccess.ProvidedCapabilityElements getProvidedCapabilityAccess() { return gaBeeLangTestLanguage.getProvidedCapabilityAccess(); @@ -135,12 +130,8 @@ public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //AliasedRequiredCapability: - // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';') + // ? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) // '}'); public BeeLangTestLanguageGrammarAccess.AliasedRequiredCapabilityElements getAliasedRequiredCapabilityAccess() { return gaBeeLangTestLanguage.getAliasedRequiredCapabilityAccess(); @@ -151,12 +142,9 @@ public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //RequiredCapability: - // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" + // ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')? + // ) // '}'); public BeeLangTestLanguageGrammarAccess.RequiredCapabilityElements getRequiredCapabilityAccess() { return gaBeeLangTestLanguage.getRequiredCapabilityAccess(); @@ -659,8 +647,9 @@ public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //ClosureExpression Expression: - // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration) - // * (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? + // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' + // parameters+=ParameterDeclaration)* (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." + // parameters+=ParameterDeclaration)? // '|' funcExpr=OneOrManyExpressions; public BeeLangTestLanguageGrammarAccess.ClosureExpressionElements getClosureExpressionAccess() { return gaBeeLangTestLanguage.getClosureExpressionAccess(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java index eff8b8909..0d23908ad 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java @@ -105,13 +105,9 @@ public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinde //Unit: // {Unit} documentation=DOCUMENTATION? // 'unit' name=ID? ('version' version=ID)? ('implements' implements+=SimpleTypeRef (',' implements+=SimpleTypeRef)*)? - // '{' ( ('source' ':' sourceLocation=Path ';')? - // & ('output' ':' outputLocation=Path ';')? - // & ('provides' ':' providedCapabilities+=ProvidedCapability ';')* - // & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';')* - // & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* - // & functions+=Function* - // ) + // '{' (('source' ':' sourceLocation=Path ';')? & ('output' ':' outputLocation=Path ';')? & ('provides' ':' + // providedCapabilities+=ProvidedCapability ';')* & ('requires' ':' requiredCapabilities+=AliasedRequiredCapability ';' + // )* & ('requires' 'env' ':' metaRequiredCapabilities+=RequiredCapability ';')* & functions+=Function*) // '}'; public BeeLangTestLanguageGrammarAccess.UnitElements getUnitAccess() { return gaBeeLangTestLanguage.getUnitAccess(); @@ -122,9 +118,8 @@ public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinde } //ProvidedCapability: - // {ProvidedCapability} (nameSpace=ID | "unit") ('{' ( ('when' ':' condExpr=Expression ';')? - // & "name" ':' name=ID ';' & ("version" ':' version=ID ';')? - // ) + // {ProvidedCapability} (nameSpace=ID | "unit") ('{' (('when' ':' condExpr=Expression ';')? & "name" ':' name=ID ';' & + // ("version" ':' version=ID ';')?) // '}')?; public BeeLangTestLanguageGrammarAccess.ProvidedCapabilityElements getProvidedCapabilityAccess() { return gaBeeLangTestLanguage.getProvidedCapabilityAccess(); @@ -135,12 +130,8 @@ public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinde } //AliasedRequiredCapability: - // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // (nameSpace=ID | "unit") name=ID ("as" alias=ID)? ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" ';') + // ? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')?) // '}'); public BeeLangTestLanguageGrammarAccess.AliasedRequiredCapabilityElements getAliasedRequiredCapabilityAccess() { return gaBeeLangTestLanguage.getAliasedRequiredCapabilityAccess(); @@ -151,12 +142,9 @@ public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinde } //RequiredCapability: - // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' ( ('when' ':' condExpr=Expression ';')? - // & (greedy?="greedy" ';')? - // & ("requires-min" ':' min=INT ';')? - // & ("requires-max" ':' max=INT ';')? - // & ("version" ':' versionRange=ID ';')? - // ) + // {RequiredCapability} (nameSpace=ID | "unit") name=ID ('{' (('when' ':' condExpr=Expression ';')? & (greedy?="greedy" + // ';')? & ("requires-min" ':' min=INT ';')? & ("requires-max" ':' max=INT ';')? & ("version" ':' versionRange=ID ';')? + // ) // '}'); public BeeLangTestLanguageGrammarAccess.RequiredCapabilityElements getRequiredCapabilityAccess() { return gaBeeLangTestLanguage.getRequiredCapabilityAccess(); @@ -659,8 +647,9 @@ public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinde } //ClosureExpression Expression: - // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' parameters+=ParameterDeclaration) - // * (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." parameters+=ParameterDeclaration)? + // {Function} ('<' returnType=TypeRef '>')? ('|'? (parameters+=ParameterDeclaration (',' + // parameters+=ParameterDeclaration)* (',' varArgs?="..." parameters+=ParameterDeclaration)?) | varArgs?="..." + // parameters+=ParameterDeclaration)? // '|' funcExpr=OneOrManyExpressions; public BeeLangTestLanguageGrammarAccess.ClosureExpressionElements getClosureExpressionAccess() { return gaBeeLangTestLanguage.getClosureExpressionAccess(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java index eec114f65..0f9c73922 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java @@ -500,19 +500,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cGroupsGroupParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //Alternatives AbstractElement: - // Group ({Alternatives.groups+= current} ('|' groups+=Group)+)?; + // Group ({Alternatives.groups+=current} ('|' groups+=Group)+)?; @Override public ParserRule getRule() { return rule; } - //Group ({Alternatives.groups+= current} ('|' groups+=Group)+)? + //Group ({Alternatives.groups+=current} ('|' groups+=Group)+)? public Group getGroup() { return cGroup; } //Group public RuleCall getGroupParserRuleCall_0() { return cGroupParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=Group)+)? + //({Alternatives.groups+=current} ('|' groups+=Group)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=Group)+ @@ -537,19 +537,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); //Group AbstractElement: - // AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)?; + // AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)?; @Override public ParserRule getRule() { return rule; } - //AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)? + //AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)? public Group getGroup() { return cGroup; } //AbstractToken public RuleCall getAbstractTokenParserRuleCall_0() { return cAbstractTokenParserRuleCall_0; } - //({Group.tokens+= current} tokens+=AbstractToken+)? + //({Group.tokens+=current} tokens+=AbstractToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.tokens+= current} + //{Group.tokens+=current} public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //tokens+=AbstractToken+ @@ -850,19 +850,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cGroupsAssignableTerminalParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)?; @Override public ParserRule getRule() { return rule; } - //AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)? + //AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)? public Group getGroup() { return cGroup; } //AssignableTerminal public RuleCall getAssignableTerminalParserRuleCall_0() { return cAssignableTerminalParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)? + //({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=AssignableTerminal)+ @@ -978,19 +978,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cGroupsCrossReferenceableTerminalParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //CrossReferenceableAlternatives AbstractElement: - // CrossReferenceableTerminal ({Alternatives.groups+= current} ('|' groups+=CrossReferenceableTerminal)+)?; + // CrossReferenceableTerminal ({Alternatives.groups+=current} ('|' groups+=CrossReferenceableTerminal)+)?; @Override public ParserRule getRule() { return rule; } - //CrossReferenceableTerminal ({Alternatives.groups+= current} ('|' groups+=CrossReferenceableTerminal)+)? + //CrossReferenceableTerminal ({Alternatives.groups+=current} ('|' groups+=CrossReferenceableTerminal)+)? public Group getGroup() { return cGroup; } //CrossReferenceableTerminal public RuleCall getCrossReferenceableTerminalParserRuleCall_0() { return cCrossReferenceableTerminalParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=CrossReferenceableTerminal)+)? + //({Alternatives.groups+=current} ('|' groups+=CrossReferenceableTerminal)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=CrossReferenceableTerminal)+ @@ -1099,19 +1099,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cGroupsTerminalGroupParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)?; @Override public ParserRule getRule() { return rule; } - //TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)? + //TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)? public Group getGroup() { return cGroup; } //TerminalGroup public RuleCall getTerminalGroupParserRuleCall_0() { return cTerminalGroupParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)? + //({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=TerminalGroup)+ @@ -1136,19 +1136,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); //TerminalGroup AbstractElement: - // TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)?; + // TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)?; @Override public ParserRule getRule() { return rule; } - //TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)? + //TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)? public Group getGroup() { return cGroup; } //TerminalToken public RuleCall getTerminalTokenParserRuleCall_0() { return cTerminalTokenParserRuleCall_0; } - //({Group.tokens+= current} tokens+=TerminalToken+)? + //({Group.tokens+=current} tokens+=TerminalToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.tokens+= current} + //{Group.tokens+=current} public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //tokens+=TerminalToken+ @@ -1437,19 +1437,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cGroupsEnumLiteralDeclarationParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)?; @Override public ParserRule getRule() { return rule; } - //EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)? + //EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)? public Group getGroup() { return cGroup; } //EnumLiteralDeclaration public RuleCall getEnumLiteralDeclarationParserRuleCall_0() { return cEnumLiteralDeclarationParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)? + //({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=EnumLiteralDeclaration)+ @@ -1713,7 +1713,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //Alternatives AbstractElement: - // Group ({Alternatives.groups+= current} ('|' groups+=Group)+)?; + // Group ({Alternatives.groups+=current} ('|' groups+=Group)+)?; public AlternativesElements getAlternativesAccess() { return pAlternatives; } @@ -1723,7 +1723,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //Group AbstractElement: - // AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)?; + // AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)?; public GroupElements getGroupAccess() { return pGroup; } @@ -1824,7 +1824,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)?; public AssignableAlternativesElements getAssignableAlternativesAccess() { return pAssignableAlternatives; } @@ -1864,7 +1864,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //CrossReferenceableAlternatives AbstractElement: - // CrossReferenceableTerminal ({Alternatives.groups+= current} ('|' groups+=CrossReferenceableTerminal)+)?; + // CrossReferenceableTerminal ({Alternatives.groups+=current} ('|' groups+=CrossReferenceableTerminal)+)?; public CrossReferenceableAlternativesElements getCrossReferenceableAlternativesAccess() { return pCrossReferenceableAlternatives; } @@ -1896,7 +1896,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)?; public TerminalAlternativesElements getTerminalAlternativesAccess() { return pTerminalAlternatives; } @@ -1906,7 +1906,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //TerminalGroup AbstractElement: - // TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)?; + // TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)?; public TerminalGroupElements getTerminalGroupAccess() { return pTerminalGroup; } @@ -2009,7 +2009,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)?; public EnumLiteralsElements getEnumLiteralsAccess() { return pEnumLiterals; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java index 2c25206c1..366f9e22f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java @@ -992,8 +992,8 @@ public class EpatchTestLanguageGrammarAccess extends AbstractElementFinder.Abstr private final RuleCall cImpFragFRAGMENTTerminalRuleCall_2_4_1_0 = (RuleCall)cImpFragAssignment_2_4_1.eContents().get(0); //ListAssignmentValue AssignmentValue: - // index=INT ":" ("[" refIndex=INT "]" | value=STRING | refObject=[NamedObject] ("." refFeature=ID ("[" refIndex=INT "]" - // )?)? | newObject=CreatedObject | ^import=[Import] impFrag=FRAGMENT); + // index=INT ":" ("[" refIndex=INT "]" | value=STRING | refObject=[NamedObject] ("." refFeature=ID ("[" refIndex=INT + // "]")?)? | newObject=CreatedObject | ^import=[Import] impFrag=FRAGMENT); @Override public ParserRule getRule() { return rule; } //index=INT ":" ("[" refIndex=INT "]" | value=STRING | refObject=[NamedObject] ("." refFeature=ID ("[" refIndex=INT @@ -1754,8 +1754,8 @@ public class EpatchTestLanguageGrammarAccess extends AbstractElementFinder.Abstr } //ListAssignmentValue AssignmentValue: - // index=INT ":" ("[" refIndex=INT "]" | value=STRING | refObject=[NamedObject] ("." refFeature=ID ("[" refIndex=INT "]" - // )?)? | newObject=CreatedObject | ^import=[Import] impFrag=FRAGMENT); + // index=INT ":" ("[" refIndex=INT "]" | value=STRING | refObject=[NamedObject] ("." refFeature=ID ("[" refIndex=INT + // "]")?)? | newObject=CreatedObject | ^import=[Import] impFrag=FRAGMENT); public ListAssignmentValueElements getListAssignmentValueAccess() { return pListAssignmentValue; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java index 2893277d7..10bd14039 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java @@ -122,8 +122,8 @@ public class ParametersTestLanguageGrammarAccess extends AbstractElementFinder.A //('#1' scenario=Scenario1 | '#2' scenario=Scenario1 | '#3' scenario=Scenario2 | '#4' //scenario=Scenario2 | => ('#5' scenario=Scenario2) | => ('#6' scenario=Scenario2) | '#7' //scenario=Scenario3 | '#8' scenario=Scenario3 | '#9' (scenario=Scenario4 | scenario=Scenario2 - //'keyword'?) | '#10' (scenario=Scenario4 | scenario=Scenario2 'keyword'?) | '#11' (scenario=Scenario4 | - //scenario=Scenario2 'keyword'?) | '#12' (scenario=Scenario4 | scenario=Scenario2 'keyword'?)) + //'keyword'?) | '#10' (scenario=Scenario4 | scenario=Scenario2 'keyword'?) | '#11' (scenario=Scenario4 + //| scenario=Scenario2 'keyword'?) | '#12' (scenario=Scenario4 | scenario=Scenario2 'keyword'?)) public Alternatives getAlternatives_1() { return cAlternatives_1; } //'#1' scenario=Scenario1 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java index 751d5c1f9..36aa50d69 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java @@ -113,9 +113,10 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractElementFinde //{ParserRuleParameters} ('#1' scenario=Scenario5 | '#2' scenario=Scenario5 | '#3' //scenario=Scenario6 | '#4' scenario=Scenario6 | => ('#5' scenario=Scenario6) | => ( //'#6' scenario=Scenario6) | '#7' scenario=Scenario7 | '#8' scenario=Scenario7 | - //'#9' (scenario=Scenario8 | scenario=Scenario6 'keyword'?) | '#10' (scenario=Scenario8 - //| scenario=Scenario6 'keyword'?) | '#11' (scenario=Scenario8 | scenario=Scenario6 - //'keyword'?) | '#12' (scenario=Scenario8 | scenario=Scenario6 'keyword'?)) + //'#9' (scenario=Scenario8 | scenario=Scenario6 'keyword'?) | '#10' + //(scenario=Scenario8 | scenario=Scenario6 'keyword'?) | '#11' (scenario=Scenario8 + //| scenario=Scenario6 'keyword'?) | '#12' (scenario=Scenario8 | + //scenario=Scenario6 'keyword'?)) public Group getGroup() { return cGroup; } //{ParserRuleParameters} diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java index 039235273..7e314d06e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java @@ -499,19 +499,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cGroupsGroupParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //Alternatives AbstractElement: - // Group ({Alternatives.groups+= current} ('|' groups+=Group)+)?; + // Group ({Alternatives.groups+=current} ('|' groups+=Group)+)?; @Override public ParserRule getRule() { return rule; } - //Group ({Alternatives.groups+= current} ('|' groups+=Group)+)? + //Group ({Alternatives.groups+=current} ('|' groups+=Group)+)? public Group getGroup() { return cGroup; } //Group public RuleCall getGroupParserRuleCall_0() { return cGroupParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=Group)+)? + //({Alternatives.groups+=current} ('|' groups+=Group)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=Group)+ @@ -536,19 +536,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cTokensAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); //Group AbstractElement: - // AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)?; + // AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)?; @Override public ParserRule getRule() { return rule; } - //AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)? + //AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)? public Group getGroup() { return cGroup; } //AbstractToken public RuleCall getAbstractTokenParserRuleCall_0() { return cAbstractTokenParserRuleCall_0; } - //({Group.tokens+= current} tokens+=AbstractToken+)? + //({Group.tokens+=current} tokens+=AbstractToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.tokens+= current} + //{Group.tokens+=current} public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //tokens+=AbstractToken+ @@ -849,19 +849,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cGroupsAssignableTerminalParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)?; @Override public ParserRule getRule() { return rule; } - //AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)? + //AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)? public Group getGroup() { return cGroup; } //AssignableTerminal public RuleCall getAssignableTerminalParserRuleCall_0() { return cAssignableTerminalParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)? + //({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=AssignableTerminal)+ @@ -1032,19 +1032,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cGroupsTerminalGroupParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)?; @Override public ParserRule getRule() { return rule; } - //TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)? + //TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)? public Group getGroup() { return cGroup; } //TerminalGroup public RuleCall getTerminalGroupParserRuleCall_0() { return cTerminalGroupParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)? + //({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=TerminalGroup)+ @@ -1069,19 +1069,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cTokensTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cTokensAssignment_1_1.eContents().get(0); //TerminalGroup AbstractElement: - // TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)?; + // TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)?; @Override public ParserRule getRule() { return rule; } - //TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)? + //TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)? public Group getGroup() { return cGroup; } //TerminalToken public RuleCall getTerminalTokenParserRuleCall_0() { return cTerminalTokenParserRuleCall_0; } - //({Group.tokens+= current} tokens+=TerminalToken+)? + //({Group.tokens+=current} tokens+=TerminalToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.tokens+= current} + //{Group.tokens+=current} public Action getGroupTokensAction_1_0() { return cGroupTokensAction_1_0; } //tokens+=TerminalToken+ @@ -1370,19 +1370,19 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind private final RuleCall cGroupsEnumLiteralDeclarationParserRuleCall_1_1_1_0 = (RuleCall)cGroupsAssignment_1_1_1.eContents().get(0); //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)?; @Override public ParserRule getRule() { return rule; } - //EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)? + //EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)? public Group getGroup() { return cGroup; } //EnumLiteralDeclaration public RuleCall getEnumLiteralDeclarationParserRuleCall_0() { return cEnumLiteralDeclarationParserRuleCall_0; } - //({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)? + //({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.groups+= current} + //{Alternatives.groups+=current} public Action getAlternativesGroupsAction_1_0() { return cAlternativesGroupsAction_1_0; } //('|' groups+=EnumLiteralDeclaration)+ @@ -1648,7 +1648,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //Alternatives AbstractElement: - // Group ({Alternatives.groups+= current} ('|' groups+=Group)+)?; + // Group ({Alternatives.groups+=current} ('|' groups+=Group)+)?; public AlternativesElements getAlternativesAccess() { return pAlternatives; } @@ -1658,7 +1658,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //Group AbstractElement: - // AbstractToken ({Group.tokens+= current} tokens+=AbstractToken+)?; + // AbstractToken ({Group.tokens+=current} tokens+=AbstractToken+)?; public GroupElements getGroupAccess() { return pGroup; } @@ -1759,7 +1759,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.groups+= current} ('|' groups+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.groups+=current} ('|' groups+=AssignableTerminal)+)?; public AssignableAlternativesElements getAssignableAlternativesAccess() { return pAssignableAlternatives; } @@ -1811,7 +1811,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.groups+= current} ('|' groups+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.groups+=current} ('|' groups+=TerminalGroup)+)?; public TerminalAlternativesElements getTerminalAlternativesAccess() { return pTerminalAlternatives; } @@ -1821,7 +1821,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //TerminalGroup AbstractElement: - // TerminalToken ({Group.tokens+= current} tokens+=TerminalToken+)?; + // TerminalToken ({Group.tokens+=current} tokens+=TerminalToken+)?; public TerminalGroupElements getTerminalGroupAccess() { return pTerminalGroup; } @@ -1924,7 +1924,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFind } //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.groups+= current} ('|' groups+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.groups+=current} ('|' groups+=EnumLiteralDeclaration)+)?; public EnumLiteralsElements getEnumLiteralsAccess() { return pEnumLiterals; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java index 7e1209e41..8230cc86d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java @@ -144,16 +144,16 @@ public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractElem private final RuleCall cPostfixSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cPostfixAssignment_3_1.eContents().get(0); //Expression: - // {Expression} ( '['? & prefix=STRING? ) ('['? terms+=SimpleTerm ']'?)* ( ']'? & postfix=STRING? ); + // {Expression} ('['? & prefix=STRING?) ('['? terms+=SimpleTerm ']'?)* (']'? & postfix=STRING?); @Override public ParserRule getRule() { return rule; } - //{Expression} ( '['? & prefix=STRING? ) ('['? terms+=SimpleTerm ']'?)* ( ']'? & postfix=STRING? ) + //{Expression} ('['? & prefix=STRING?) ('['? terms+=SimpleTerm ']'?)* (']'? & postfix=STRING?) public Group getGroup() { return cGroup; } //{Expression} public Action getExpressionAction_0() { return cExpressionAction_0; } - //( '['? & prefix=STRING? ) + //('['? & prefix=STRING?) public UnorderedGroup getUnorderedGroup_1() { return cUnorderedGroup_1; } //'['? @@ -180,7 +180,7 @@ public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractElem //']'? public Keyword getRightSquareBracketKeyword_2_2() { return cRightSquareBracketKeyword_2_2; } - //( ']'? & postfix=STRING? ) + //(']'? & postfix=STRING?) public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; } //']'? @@ -343,7 +343,7 @@ public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractElem } //Expression: - // {Expression} ( '['? & prefix=STRING? ) ('['? terms+=SimpleTerm ']'?)* ( ']'? & postfix=STRING? ); + // {Expression} ('['? & prefix=STRING?) ('['? terms+=SimpleTerm ']'?)* (']'? & postfix=STRING?); public ExpressionElements getExpressionAccess() { return pExpression; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java index 55c9e087c..087beba0a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java @@ -123,7 +123,7 @@ public class ExBacktrackingBug325745TestLanguageGrammarAccess extends AbstractEl } //Expression: - // {Expression} ( '['? & prefix=STRING? ) ('['? terms+=SimpleTerm ']'?)* ( ']'? & postfix=STRING? ); + // {Expression} ('['? & prefix=STRING?) ('['? terms+=SimpleTerm ']'?)* (']'? & postfix=STRING?); public BacktrackingBug325745TestLanguageGrammarAccess.ExpressionElements getExpressionAccess() { return gaBacktrackingBug325745TestLanguage.getExpressionAccess(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java index ca190e11d..b3e1dbbe6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java @@ -91,15 +91,15 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementF } //Model: - // {Model} ('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? - // & second?='b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ - // & secondAsList+='b'* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' - // ) | '9' ( firstAsList+='a' & secondAsList+='b' ) + - // | '10' ( firstAsList+='a' & secondAsList+='b' ) * - // | '11' ( first?='a' & second?='b' ) ? - // | '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - // & secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - // | '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + // {Model} ('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a' + // ? & second?='b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ + // & secondAsList+='b'*) | '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d' + // ) | '9' (firstAsList+='a' & secondAsList+='b') + + // | '10' (firstAsList+='a' & secondAsList+='b') * + // | '11' (first?='a' & second?='b') ? + // | '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + // & secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + // | '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + // | 'datatypes' value=UnorderedDatatype // | 'serialization' serialized=UnorderedSerialization // | 'bug302585' nestedModel+=NestedModel*); @@ -112,7 +112,7 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementF } //NestedModel: - // {NestedModel} ( first?="a" & second?="b" ) ? + // {NestedModel} (first?="a" & second?="b") ? // 'nested'; public UnorderedGroupsTestLanguageGrammarAccess.NestedModelElements getNestedModelAccess() { return gaUnorderedGroupsTestLanguage.getNestedModelAccess(); @@ -123,12 +123,12 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementF } //UnorderedDatatype: - // '1' ( 'a' & 'b' ) | '2' ( 'a' & 'b' & 'c' & 'd' ) | '3' ( 'a'? & 'b'? ) | '4' ( 'a' & 'b'? ) | '5' ( 'a'? & 'b' ) | '6' ( - // 'a'+ & 'b'* ) | '7' ( 'a'* & 'b'+ ) | '8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) | '9' ( 'a' & 'b' ) + - // | '10' ( 'a' & 'b' ) * - // | '11' ( 'a' & 'b' ) ? - // | '12' ( 'a' & 'b' ) ( 'a' & 'b' ) | '13' ( 'a' & 'b' ) ? 'a' 'b' - // | '14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) +; + // '1' ('a' & 'b') | '2' ('a' & 'b' & 'c' & 'd') | '3' ('a'? & 'b'?) | '4' ('a' & 'b'?) | '5' ('a'? & 'b') | '6' ('a'+ + // & 'b'*) | '7' ('a'* & 'b'+) | '8' ('a' 'b' 'c' & 'a' 'b' 'd') | '9' ('a' & 'b') + + // | '10' ('a' & 'b') * + // | '11' ('a' & 'b') ? + // | '12' ('a' & 'b') ('a' & 'b') | '13' ('a' & 'b') ? 'a' 'b' + // | '14' (('a' & 'b') & ('c' & 'd')) +; public UnorderedGroupsTestLanguageGrammarAccess.UnorderedDatatypeElements getUnorderedDatatypeAccess() { return gaUnorderedGroupsTestLanguage.getUnorderedDatatypeAccess(); } @@ -139,9 +139,9 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementF ///* SuppressWarnings[potentialOverride] */ //UnorderedSerialization: - // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - // | '2' ( firstAsList+='a' & secondAsList+='b' ) * - // | '3' ( firstAsList+='a'+ & second?='b' ) *); + // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + // | '2' (firstAsList+='a' & secondAsList+='b') * + // | '3' (firstAsList+='a'+ & second?='b') *); public UnorderedGroupsTestLanguageGrammarAccess.UnorderedSerializationElements getUnorderedSerializationAccess() { return gaUnorderedGroupsTestLanguage.getUnorderedSerializationAccess(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java index 6b2bb06c1..7159ff010 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java @@ -123,7 +123,7 @@ public class SimpleBacktrackingBug325745TestLanguageGrammarAccess extends Abstra } //Expression: - // {Expression} ( '['? & prefix=STRING? ) ('['? terms+=SimpleTerm ']'?)* ( ']'? & postfix=STRING? ); + // {Expression} ('['? & prefix=STRING?) ('['? terms+=SimpleTerm ']'?)* (']'? & postfix=STRING?); public BacktrackingBug325745TestLanguageGrammarAccess.ExpressionElements getExpressionAccess() { return gaBacktrackingBug325745TestLanguage.getExpressionAccess(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java index fa847ddb5..055dc5387 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java @@ -91,15 +91,15 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractElem } //Model: - // {Model} ('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? - // & second?='b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ - // & secondAsList+='b'* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' - // ) | '9' ( firstAsList+='a' & secondAsList+='b' ) + - // | '10' ( firstAsList+='a' & secondAsList+='b' ) * - // | '11' ( first?='a' & second?='b' ) ? - // | '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - // & secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - // | '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + // {Model} ('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a' + // ? & second?='b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ + // & secondAsList+='b'*) | '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d' + // ) | '9' (firstAsList+='a' & secondAsList+='b') + + // | '10' (firstAsList+='a' & secondAsList+='b') * + // | '11' (first?='a' & second?='b') ? + // | '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + // & secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + // | '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + // | 'datatypes' value=UnorderedDatatype // | 'serialization' serialized=UnorderedSerialization // | 'bug302585' nestedModel+=NestedModel*); @@ -112,7 +112,7 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractElem } //NestedModel: - // {NestedModel} ( first?="a" & second?="b" ) ? + // {NestedModel} (first?="a" & second?="b") ? // 'nested'; public UnorderedGroupsTestLanguageGrammarAccess.NestedModelElements getNestedModelAccess() { return gaUnorderedGroupsTestLanguage.getNestedModelAccess(); @@ -123,12 +123,12 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractElem } //UnorderedDatatype: - // '1' ( 'a' & 'b' ) | '2' ( 'a' & 'b' & 'c' & 'd' ) | '3' ( 'a'? & 'b'? ) | '4' ( 'a' & 'b'? ) | '5' ( 'a'? & 'b' ) | '6' ( - // 'a'+ & 'b'* ) | '7' ( 'a'* & 'b'+ ) | '8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) | '9' ( 'a' & 'b' ) + - // | '10' ( 'a' & 'b' ) * - // | '11' ( 'a' & 'b' ) ? - // | '12' ( 'a' & 'b' ) ( 'a' & 'b' ) | '13' ( 'a' & 'b' ) ? 'a' 'b' - // | '14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) +; + // '1' ('a' & 'b') | '2' ('a' & 'b' & 'c' & 'd') | '3' ('a'? & 'b'?) | '4' ('a' & 'b'?) | '5' ('a'? & 'b') | '6' ('a'+ + // & 'b'*) | '7' ('a'* & 'b'+) | '8' ('a' 'b' 'c' & 'a' 'b' 'd') | '9' ('a' & 'b') + + // | '10' ('a' & 'b') * + // | '11' ('a' & 'b') ? + // | '12' ('a' & 'b') ('a' & 'b') | '13' ('a' & 'b') ? 'a' 'b' + // | '14' (('a' & 'b') & ('c' & 'd')) +; public UnorderedGroupsTestLanguageGrammarAccess.UnorderedDatatypeElements getUnorderedDatatypeAccess() { return gaUnorderedGroupsTestLanguage.getUnorderedDatatypeAccess(); } @@ -139,9 +139,9 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractElem ///* SuppressWarnings[potentialOverride] */ //UnorderedSerialization: - // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - // | '2' ( firstAsList+='a' & secondAsList+='b' ) * - // | '3' ( firstAsList+='a'+ & second?='b' ) *); + // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + // | '2' (firstAsList+='a' & secondAsList+='b') * + // | '3' (firstAsList+='a'+ & second?='b') *); public UnorderedGroupsTestLanguageGrammarAccess.UnorderedSerializationElements getUnorderedSerializationAccess() { return gaUnorderedGroupsTestLanguage.getUnorderedSerializationAccess(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java index 759cf0363..82546a4c8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java @@ -166,29 +166,29 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin private final RuleCall cNestedModelNestedModelParserRuleCall_1_16_1_0 = (RuleCall)cNestedModelAssignment_1_16_1.eContents().get(0); //Model: - // {Model} ('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? - // & second?='b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ - // & secondAsList+='b'* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' - // ) | '9' ( firstAsList+='a' & secondAsList+='b' ) + - // | '10' ( firstAsList+='a' & secondAsList+='b' ) * - // | '11' ( first?='a' & second?='b' ) ? - // | '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - // & secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - // | '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + // {Model} ('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a' + // ? & second?='b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ + // & secondAsList+='b'*) | '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d' + // ) | '9' (firstAsList+='a' & secondAsList+='b') + + // | '10' (firstAsList+='a' & secondAsList+='b') * + // | '11' (first?='a' & second?='b') ? + // | '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + // & secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + // | '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + // | 'datatypes' value=UnorderedDatatype // | 'serialization' serialized=UnorderedSerialization // | 'bug302585' nestedModel+=NestedModel*); @Override public ParserRule getRule() { return rule; } - //{Model} ('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? - //& second?='b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ - //& secondAsList+='b'* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' ) | - //'9' ( firstAsList+='a' & secondAsList+='b' ) + - //| '10' ( firstAsList+='a' & secondAsList+='b' ) * - //| '11' ( first?='a' & second?='b' ) ? - //| '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - //& secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - //| '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + //{Model} ('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a'? + //& second?='b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ + //& secondAsList+='b'*) | '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d') | + //'9' (firstAsList+='a' & secondAsList+='b') + + //| '10' (firstAsList+='a' & secondAsList+='b') * + //| '11' (first?='a' & second?='b') ? + //| '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + //& secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + //| '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + //| 'datatypes' value=UnorderedDatatype //| 'serialization' serialized=UnorderedSerialization //| 'bug302585' nestedModel+=NestedModel*) @@ -197,27 +197,27 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //{Model} public Action getModelAction_0() { return cModelAction_0; } - //('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? & second?= - //'b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ & secondAsList+='b' - //* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' ) | '9' ( firstAsList+= - //'a' & secondAsList+='b' ) + - //| '10' ( firstAsList+='a' & secondAsList+='b' ) * - //| '11' ( first?='a' & second?='b' ) ? - //| '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - //& secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - //| '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + //('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a'? & second?= + //'b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ & secondAsList+='b'*) + //| '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d') | '9' (firstAsList+='a' + //& secondAsList+='b') + + //| '10' (firstAsList+='a' & secondAsList+='b') * + //| '11' (first?='a' & second?='b') ? + //| '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + //& secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + //| '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + //| 'datatypes' value=UnorderedDatatype //| 'serialization' serialized=UnorderedSerialization //| 'bug302585' nestedModel+=NestedModel*) public Alternatives getAlternatives_1() { return cAlternatives_1; } - //'1' ( first?='a' & second?='b' ) + //'1' (first?='a' & second?='b') public Group getGroup_1_0() { return cGroup_1_0; } //'1' public Keyword getDigitOneKeyword_1_0_0() { return cDigitOneKeyword_1_0_0; } - //( first?='a' & second?='b' ) + //(first?='a' & second?='b') public UnorderedGroup getUnorderedGroup_1_0_1() { return cUnorderedGroup_1_0_1; } //first?='a' @@ -232,13 +232,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondBKeyword_1_0_1_1_0() { return cSecondBKeyword_1_0_1_1_0; } - //'2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) + //'2' (first?='a' & second?='b' & third?='c' & forth?='d') public Group getGroup_1_1() { return cGroup_1_1; } //'2' public Keyword getDigitTwoKeyword_1_1_0() { return cDigitTwoKeyword_1_1_0; } - //( first?='a' & second?='b' & third?='c' & forth?='d' ) + //(first?='a' & second?='b' & third?='c' & forth?='d') public UnorderedGroup getUnorderedGroup_1_1_1() { return cUnorderedGroup_1_1_1; } //first?='a' @@ -265,13 +265,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'d' public Keyword getForthDKeyword_1_1_1_3_0() { return cForthDKeyword_1_1_1_3_0; } - //'3' ( first?='a'? & second?='b'? ) + //'3' (first?='a'? & second?='b'?) public Group getGroup_1_2() { return cGroup_1_2; } //'3' public Keyword getDigitThreeKeyword_1_2_0() { return cDigitThreeKeyword_1_2_0; } - //( first?='a'? & second?='b'? ) + //(first?='a'? & second?='b'?) public UnorderedGroup getUnorderedGroup_1_2_1() { return cUnorderedGroup_1_2_1; } //first?='a'? @@ -286,13 +286,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondBKeyword_1_2_1_1_0() { return cSecondBKeyword_1_2_1_1_0; } - //'4' ( first?='a' & second?='b'? ) + //'4' (first?='a' & second?='b'?) public Group getGroup_1_3() { return cGroup_1_3; } //'4' public Keyword getDigitFourKeyword_1_3_0() { return cDigitFourKeyword_1_3_0; } - //( first?='a' & second?='b'? ) + //(first?='a' & second?='b'?) public UnorderedGroup getUnorderedGroup_1_3_1() { return cUnorderedGroup_1_3_1; } //first?='a' @@ -307,13 +307,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondBKeyword_1_3_1_1_0() { return cSecondBKeyword_1_3_1_1_0; } - //'5' ( first?='a'? & second?='b' ) + //'5' (first?='a'? & second?='b') public Group getGroup_1_4() { return cGroup_1_4; } //'5' public Keyword getDigitFiveKeyword_1_4_0() { return cDigitFiveKeyword_1_4_0; } - //( first?='a'? & second?='b' ) + //(first?='a'? & second?='b') public UnorderedGroup getUnorderedGroup_1_4_1() { return cUnorderedGroup_1_4_1; } //first?='a'? @@ -328,13 +328,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondBKeyword_1_4_1_1_0() { return cSecondBKeyword_1_4_1_1_0; } - //'6' ( firstAsList+='a'+ & secondAsList+='b'* ) + //'6' (firstAsList+='a'+ & secondAsList+='b'*) public Group getGroup_1_5() { return cGroup_1_5; } //'6' public Keyword getDigitSixKeyword_1_5_0() { return cDigitSixKeyword_1_5_0; } - //( firstAsList+='a'+ & secondAsList+='b'* ) + //(firstAsList+='a'+ & secondAsList+='b'*) public UnorderedGroup getUnorderedGroup_1_5_1() { return cUnorderedGroup_1_5_1; } //firstAsList+='a'+ @@ -349,13 +349,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_5_1_1_0() { return cSecondAsListBKeyword_1_5_1_1_0; } - //'7' ( firstAsList+='a'* & secondAsList+='b'+ ) + //'7' (firstAsList+='a'* & secondAsList+='b'+) public Group getGroup_1_6() { return cGroup_1_6; } //'7' public Keyword getDigitSevenKeyword_1_6_0() { return cDigitSevenKeyword_1_6_0; } - //( firstAsList+='a'* & secondAsList+='b'+ ) + //(firstAsList+='a'* & secondAsList+='b'+) public UnorderedGroup getUnorderedGroup_1_6_1() { return cUnorderedGroup_1_6_1; } //firstAsList+='a'* @@ -370,13 +370,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_6_1_1_0() { return cSecondAsListBKeyword_1_6_1_1_0; } - //'8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' ) + //'8' ('a' 'b' first?='c' & 'a' 'b' second?='d') public Group getGroup_1_7() { return cGroup_1_7; } //'8' public Keyword getDigitEightKeyword_1_7_0() { return cDigitEightKeyword_1_7_0; } - //( 'a' 'b' first?='c' & 'a' 'b' second?='d' ) + //('a' 'b' first?='c' & 'a' 'b' second?='d') public UnorderedGroup getUnorderedGroup_1_7_1() { return cUnorderedGroup_1_7_1; } //'a' 'b' first?='c' @@ -409,13 +409,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'d' public Keyword getSecondDKeyword_1_7_1_1_2_0() { return cSecondDKeyword_1_7_1_1_2_0; } - //'9' ( firstAsList+='a' & secondAsList+='b' ) + + //'9' (firstAsList+='a' & secondAsList+='b') + public Group getGroup_1_8() { return cGroup_1_8; } //'9' public Keyword getDigitNineKeyword_1_8_0() { return cDigitNineKeyword_1_8_0; } - //( firstAsList+='a' & secondAsList+='b' ) + + //(firstAsList+='a' & secondAsList+='b') + public UnorderedGroup getUnorderedGroup_1_8_1() { return cUnorderedGroup_1_8_1; } //firstAsList+='a' @@ -430,13 +430,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_8_1_1_0() { return cSecondAsListBKeyword_1_8_1_1_0; } - //'10' ( firstAsList+='a' & secondAsList+='b' ) * + //'10' (firstAsList+='a' & secondAsList+='b') * public Group getGroup_1_9() { return cGroup_1_9; } //'10' public Keyword getDigitOneDigitZeroKeyword_1_9_0() { return cDigitOneDigitZeroKeyword_1_9_0; } - //( firstAsList+='a' & secondAsList+='b' ) * + //(firstAsList+='a' & secondAsList+='b') * public UnorderedGroup getUnorderedGroup_1_9_1() { return cUnorderedGroup_1_9_1; } //firstAsList+='a' @@ -451,13 +451,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_9_1_1_0() { return cSecondAsListBKeyword_1_9_1_1_0; } - //'11' ( first?='a' & second?='b' ) ? + //'11' (first?='a' & second?='b') ? public Group getGroup_1_10() { return cGroup_1_10; } //'11' public Keyword getDigitOneDigitOneKeyword_1_10_0() { return cDigitOneDigitOneKeyword_1_10_0; } - //( first?='a' & second?='b' ) ? + //(first?='a' & second?='b') ? public UnorderedGroup getUnorderedGroup_1_10_1() { return cUnorderedGroup_1_10_1; } //first?='a' @@ -472,13 +472,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondBKeyword_1_10_1_1_0() { return cSecondBKeyword_1_10_1_1_0; } - //'12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) + //'12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') public Group getGroup_1_11() { return cGroup_1_11; } //'12' public Keyword getDigitOneDigitTwoKeyword_1_11_0() { return cDigitOneDigitTwoKeyword_1_11_0; } - //( firstAsList+='a' & secondAsList+='b' ) + //(firstAsList+='a' & secondAsList+='b') public UnorderedGroup getUnorderedGroup_1_11_1() { return cUnorderedGroup_1_11_1; } //firstAsList+='a' @@ -493,7 +493,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_11_1_1_0() { return cSecondAsListBKeyword_1_11_1_1_0; } - //( firstAsList+='a' & secondAsList+='b' ) + //(firstAsList+='a' & secondAsList+='b') public UnorderedGroup getUnorderedGroup_1_11_2() { return cUnorderedGroup_1_11_2; } //firstAsList+='a' @@ -508,13 +508,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_11_2_1_0() { return cSecondAsListBKeyword_1_11_2_1_0; } - //'13' ( firstAsList+='a' & secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' + //'13' (firstAsList+='a' & secondAsList+='b') ? firstAsList+='a' secondAsList+='b' public Group getGroup_1_12() { return cGroup_1_12; } //'13' public Keyword getDigitOneDigitThreeKeyword_1_12_0() { return cDigitOneDigitThreeKeyword_1_12_0; } - //( firstAsList+='a' & secondAsList+='b' ) ? + //(firstAsList+='a' & secondAsList+='b') ? public UnorderedGroup getUnorderedGroup_1_12_1() { return cUnorderedGroup_1_12_1; } //firstAsList+='a' @@ -541,16 +541,16 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_12_3_0() { return cSecondAsListBKeyword_1_12_3_0; } - //'14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + //'14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + public Group getGroup_1_13() { return cGroup_1_13; } //'14' public Keyword getDigitOneDigitFourKeyword_1_13_0() { return cDigitOneDigitFourKeyword_1_13_0; } - //( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + //((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + public UnorderedGroup getUnorderedGroup_1_13_1() { return cUnorderedGroup_1_13_1; } - //( firstAsList+='a' & secondAsList+='b' ) + //(firstAsList+='a' & secondAsList+='b') public UnorderedGroup getUnorderedGroup_1_13_1_0() { return cUnorderedGroup_1_13_1_0; } //firstAsList+='a' @@ -565,7 +565,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_13_1_0_1_0() { return cSecondAsListBKeyword_1_13_1_0_1_0; } - //( thirdAsList+='c' & forthAsList+='d' ) + //(thirdAsList+='c' & forthAsList+='d') public UnorderedGroup getUnorderedGroup_1_13_1_1() { return cUnorderedGroup_1_13_1_1; } //thirdAsList+='c' @@ -628,18 +628,18 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin private final Keyword cNestedKeyword_2 = (Keyword)cGroup.eContents().get(2); //NestedModel: - // {NestedModel} ( first?="a" & second?="b" ) ? + // {NestedModel} (first?="a" & second?="b") ? // 'nested'; @Override public ParserRule getRule() { return rule; } - //{NestedModel} ( first?="a" & second?="b" ) ? + //{NestedModel} (first?="a" & second?="b") ? //'nested' public Group getGroup() { return cGroup; } //{NestedModel} public Action getNestedModelAction_0() { return cNestedModelAction_0; } - //( first?="a" & second?="b" ) ? + //(first?="a" & second?="b") ? public UnorderedGroup getUnorderedGroup_1() { return cUnorderedGroup_1; } //first?="a" @@ -749,29 +749,29 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin private final Keyword cDKeyword_13_1_1_1 = (Keyword)cUnorderedGroup_13_1_1.eContents().get(1); //UnorderedDatatype: - // '1' ( 'a' & 'b' ) | '2' ( 'a' & 'b' & 'c' & 'd' ) | '3' ( 'a'? & 'b'? ) | '4' ( 'a' & 'b'? ) | '5' ( 'a'? & 'b' ) | '6' ( - // 'a'+ & 'b'* ) | '7' ( 'a'* & 'b'+ ) | '8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) | '9' ( 'a' & 'b' ) + - // | '10' ( 'a' & 'b' ) * - // | '11' ( 'a' & 'b' ) ? - // | '12' ( 'a' & 'b' ) ( 'a' & 'b' ) | '13' ( 'a' & 'b' ) ? 'a' 'b' - // | '14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) +; + // '1' ('a' & 'b') | '2' ('a' & 'b' & 'c' & 'd') | '3' ('a'? & 'b'?) | '4' ('a' & 'b'?) | '5' ('a'? & 'b') | '6' ('a'+ + // & 'b'*) | '7' ('a'* & 'b'+) | '8' ('a' 'b' 'c' & 'a' 'b' 'd') | '9' ('a' & 'b') + + // | '10' ('a' & 'b') * + // | '11' ('a' & 'b') ? + // | '12' ('a' & 'b') ('a' & 'b') | '13' ('a' & 'b') ? 'a' 'b' + // | '14' (('a' & 'b') & ('c' & 'd')) +; @Override public ParserRule getRule() { return rule; } - //'1' ( 'a' & 'b' ) | '2' ( 'a' & 'b' & 'c' & 'd' ) | '3' ( 'a'? & 'b'? ) | '4' ( 'a' & 'b'? ) | '5' ( 'a'? & 'b' ) | '6' ( - //'a'+ & 'b'* ) | '7' ( 'a'* & 'b'+ ) | '8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) | '9' ( 'a' & 'b' ) + - //| '10' ( 'a' & 'b' ) * - //| '11' ( 'a' & 'b' ) ? - //| '12' ( 'a' & 'b' ) ( 'a' & 'b' ) | '13' ( 'a' & 'b' ) ? 'a' 'b' - //| '14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) + + //'1' ('a' & 'b') | '2' ('a' & 'b' & 'c' & 'd') | '3' ('a'? & 'b'?) | '4' ('a' & 'b'?) | '5' ('a'? & 'b') | '6' ('a'+ + //& 'b'*) | '7' ('a'* & 'b'+) | '8' ('a' 'b' 'c' & 'a' 'b' 'd') | '9' ('a' & 'b') + + //| '10' ('a' & 'b') * + //| '11' ('a' & 'b') ? + //| '12' ('a' & 'b') ('a' & 'b') | '13' ('a' & 'b') ? 'a' 'b' + //| '14' (('a' & 'b') & ('c' & 'd')) + public Alternatives getAlternatives() { return cAlternatives; } - //'1' ( 'a' & 'b' ) + //'1' ('a' & 'b') public Group getGroup_0() { return cGroup_0; } //'1' public Keyword getDigitOneKeyword_0_0() { return cDigitOneKeyword_0_0; } - //( 'a' & 'b' ) + //('a' & 'b') public UnorderedGroup getUnorderedGroup_0_1() { return cUnorderedGroup_0_1; } //'a' @@ -780,13 +780,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_0_1_1() { return cBKeyword_0_1_1; } - //'2' ( 'a' & 'b' & 'c' & 'd' ) + //'2' ('a' & 'b' & 'c' & 'd') public Group getGroup_1() { return cGroup_1; } //'2' public Keyword getDigitTwoKeyword_1_0() { return cDigitTwoKeyword_1_0; } - //( 'a' & 'b' & 'c' & 'd' ) + //('a' & 'b' & 'c' & 'd') public UnorderedGroup getUnorderedGroup_1_1() { return cUnorderedGroup_1_1; } //'a' @@ -801,13 +801,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'d' public Keyword getDKeyword_1_1_3() { return cDKeyword_1_1_3; } - //'3' ( 'a'? & 'b'? ) + //'3' ('a'? & 'b'?) public Group getGroup_2() { return cGroup_2; } //'3' public Keyword getDigitThreeKeyword_2_0() { return cDigitThreeKeyword_2_0; } - //( 'a'? & 'b'? ) + //('a'? & 'b'?) public UnorderedGroup getUnorderedGroup_2_1() { return cUnorderedGroup_2_1; } //'a'? @@ -816,13 +816,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b'? public Keyword getBKeyword_2_1_1() { return cBKeyword_2_1_1; } - //'4' ( 'a' & 'b'? ) + //'4' ('a' & 'b'?) public Group getGroup_3() { return cGroup_3; } //'4' public Keyword getDigitFourKeyword_3_0() { return cDigitFourKeyword_3_0; } - //( 'a' & 'b'? ) + //('a' & 'b'?) public UnorderedGroup getUnorderedGroup_3_1() { return cUnorderedGroup_3_1; } //'a' @@ -831,13 +831,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b'? public Keyword getBKeyword_3_1_1() { return cBKeyword_3_1_1; } - //'5' ( 'a'? & 'b' ) + //'5' ('a'? & 'b') public Group getGroup_4() { return cGroup_4; } //'5' public Keyword getDigitFiveKeyword_4_0() { return cDigitFiveKeyword_4_0; } - //( 'a'? & 'b' ) + //('a'? & 'b') public UnorderedGroup getUnorderedGroup_4_1() { return cUnorderedGroup_4_1; } //'a'? @@ -846,13 +846,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_4_1_1() { return cBKeyword_4_1_1; } - //'6' ( 'a'+ & 'b'* ) + //'6' ('a'+ & 'b'*) public Group getGroup_5() { return cGroup_5; } //'6' public Keyword getDigitSixKeyword_5_0() { return cDigitSixKeyword_5_0; } - //( 'a'+ & 'b'* ) + //('a'+ & 'b'*) public UnorderedGroup getUnorderedGroup_5_1() { return cUnorderedGroup_5_1; } //'a'+ @@ -861,13 +861,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b'* public Keyword getBKeyword_5_1_1() { return cBKeyword_5_1_1; } - //'7' ( 'a'* & 'b'+ ) + //'7' ('a'* & 'b'+) public Group getGroup_6() { return cGroup_6; } //'7' public Keyword getDigitSevenKeyword_6_0() { return cDigitSevenKeyword_6_0; } - //( 'a'* & 'b'+ ) + //('a'* & 'b'+) public UnorderedGroup getUnorderedGroup_6_1() { return cUnorderedGroup_6_1; } //'a'* @@ -876,13 +876,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b'+ public Keyword getBKeyword_6_1_1() { return cBKeyword_6_1_1; } - //'8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) + //'8' ('a' 'b' 'c' & 'a' 'b' 'd') public Group getGroup_7() { return cGroup_7; } //'8' public Keyword getDigitEightKeyword_7_0() { return cDigitEightKeyword_7_0; } - //( 'a' 'b' 'c' & 'a' 'b' 'd' ) + //('a' 'b' 'c' & 'a' 'b' 'd') public UnorderedGroup getUnorderedGroup_7_1() { return cUnorderedGroup_7_1; } //'a' 'b' 'c' @@ -909,13 +909,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'d' public Keyword getDKeyword_7_1_1_2() { return cDKeyword_7_1_1_2; } - //'9' ( 'a' & 'b' ) + + //'9' ('a' & 'b') + public Group getGroup_8() { return cGroup_8; } //'9' public Keyword getDigitNineKeyword_8_0() { return cDigitNineKeyword_8_0; } - //( 'a' & 'b' ) + + //('a' & 'b') + public UnorderedGroup getUnorderedGroup_8_1() { return cUnorderedGroup_8_1; } //'a' @@ -924,13 +924,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_8_1_1() { return cBKeyword_8_1_1; } - //'10' ( 'a' & 'b' ) * + //'10' ('a' & 'b') * public Group getGroup_9() { return cGroup_9; } //'10' public Keyword getDigitOneDigitZeroKeyword_9_0() { return cDigitOneDigitZeroKeyword_9_0; } - //( 'a' & 'b' ) * + //('a' & 'b') * public UnorderedGroup getUnorderedGroup_9_1() { return cUnorderedGroup_9_1; } //'a' @@ -939,13 +939,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_9_1_1() { return cBKeyword_9_1_1; } - //'11' ( 'a' & 'b' ) ? + //'11' ('a' & 'b') ? public Group getGroup_10() { return cGroup_10; } //'11' public Keyword getDigitOneDigitOneKeyword_10_0() { return cDigitOneDigitOneKeyword_10_0; } - //( 'a' & 'b' ) ? + //('a' & 'b') ? public UnorderedGroup getUnorderedGroup_10_1() { return cUnorderedGroup_10_1; } //'a' @@ -954,13 +954,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_10_1_1() { return cBKeyword_10_1_1; } - //'12' ( 'a' & 'b' ) ( 'a' & 'b' ) + //'12' ('a' & 'b') ('a' & 'b') public Group getGroup_11() { return cGroup_11; } //'12' public Keyword getDigitOneDigitTwoKeyword_11_0() { return cDigitOneDigitTwoKeyword_11_0; } - //( 'a' & 'b' ) + //('a' & 'b') public UnorderedGroup getUnorderedGroup_11_1() { return cUnorderedGroup_11_1; } //'a' @@ -969,7 +969,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_11_1_1() { return cBKeyword_11_1_1; } - //( 'a' & 'b' ) + //('a' & 'b') public UnorderedGroup getUnorderedGroup_11_2() { return cUnorderedGroup_11_2; } //'a' @@ -978,13 +978,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_11_2_1() { return cBKeyword_11_2_1; } - //'13' ( 'a' & 'b' ) ? 'a' 'b' + //'13' ('a' & 'b') ? 'a' 'b' public Group getGroup_12() { return cGroup_12; } //'13' public Keyword getDigitOneDigitThreeKeyword_12_0() { return cDigitOneDigitThreeKeyword_12_0; } - //( 'a' & 'b' ) ? + //('a' & 'b') ? public UnorderedGroup getUnorderedGroup_12_1() { return cUnorderedGroup_12_1; } //'a' @@ -999,16 +999,16 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_12_3() { return cBKeyword_12_3; } - //'14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) + + //'14' (('a' & 'b') & ('c' & 'd')) + public Group getGroup_13() { return cGroup_13; } //'14' public Keyword getDigitOneDigitFourKeyword_13_0() { return cDigitOneDigitFourKeyword_13_0; } - //( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) + + //(('a' & 'b') & ('c' & 'd')) + public UnorderedGroup getUnorderedGroup_13_1() { return cUnorderedGroup_13_1; } - //( 'a' & 'b' ) + //('a' & 'b') public UnorderedGroup getUnorderedGroup_13_1_0() { return cUnorderedGroup_13_1_0; } //'a' @@ -1017,7 +1017,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getBKeyword_13_1_0_1() { return cBKeyword_13_1_0_1; } - //( 'c' & 'd' ) + //('c' & 'd') public UnorderedGroup getUnorderedGroup_13_1_1() { return cUnorderedGroup_13_1_1; } //'c' @@ -1059,25 +1059,25 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin ///* SuppressWarnings[potentialOverride] */ //UnorderedSerialization: - // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - // | '2' ( firstAsList+='a' & secondAsList+='b' ) * - // | '3' ( firstAsList+='a'+ & second?='b' ) *); + // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + // | '2' (firstAsList+='a' & secondAsList+='b') * + // | '3' (firstAsList+='a'+ & second?='b') *); @Override public ParserRule getRule() { return rule; } - //{UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - //| '2' ( firstAsList+='a' & secondAsList+='b' ) * - //| '3' ( firstAsList+='a'+ & second?='b' ) *) + //{UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + //| '2' (firstAsList+='a' & secondAsList+='b') * + //| '3' (firstAsList+='a'+ & second?='b') *) public Group getGroup() { return cGroup; } //{UnorderedSerialization} public Action getUnorderedSerializationAction_0() { return cUnorderedSerializationAction_0; } - //('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - //| '2' ( firstAsList+='a' & secondAsList+='b' ) * - //| '3' ( firstAsList+='a'+ & second?='b' ) *) + //('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + //| '2' (firstAsList+='a' & secondAsList+='b') * + //| '3' (firstAsList+='a'+ & second?='b') *) public Alternatives getAlternatives_1() { return cAlternatives_1; } - //'1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + //'1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? public UnorderedGroup getUnorderedGroup_1_0() { return cUnorderedGroup_1_0; } //'1' first?='a'? @@ -1110,13 +1110,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'d' public Keyword getForthDKeyword_1_0_3_0() { return cForthDKeyword_1_0_3_0; } - //'2' ( firstAsList+='a' & secondAsList+='b' ) * + //'2' (firstAsList+='a' & secondAsList+='b') * public Group getGroup_1_1() { return cGroup_1_1; } //'2' public Keyword getDigitTwoKeyword_1_1_0() { return cDigitTwoKeyword_1_1_0; } - //( firstAsList+='a' & secondAsList+='b' ) * + //(firstAsList+='a' & secondAsList+='b') * public UnorderedGroup getUnorderedGroup_1_1_1() { return cUnorderedGroup_1_1_1; } //firstAsList+='a' @@ -1131,13 +1131,13 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //'b' public Keyword getSecondAsListBKeyword_1_1_1_1_0() { return cSecondAsListBKeyword_1_1_1_1_0; } - //'3' ( firstAsList+='a'+ & second?='b' ) * + //'3' (firstAsList+='a'+ & second?='b') * public Group getGroup_1_2() { return cGroup_1_2; } //'3' public Keyword getDigitThreeKeyword_1_2_0() { return cDigitThreeKeyword_1_2_0; } - //( firstAsList+='a'+ & second?='b' ) * + //(firstAsList+='a'+ & second?='b') * public UnorderedGroup getUnorderedGroup_1_2_1() { return cUnorderedGroup_1_2_1; } //firstAsList+='a'+ @@ -1202,15 +1202,15 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin //Model: - // {Model} ('1' ( first?='a' & second?='b' ) | '2' ( first?='a' & second?='b' & third?='c' & forth?='d' ) | '3' ( first?='a'? - // & second?='b'? ) | '4' ( first?='a' & second?='b'? ) | '5' ( first?='a'? & second?='b' ) | '6' ( firstAsList+='a'+ - // & secondAsList+='b'* ) | '7' ( firstAsList+='a'* & secondAsList+='b'+ ) | '8' ( 'a' 'b' first?='c' & 'a' 'b' second?='d' - // ) | '9' ( firstAsList+='a' & secondAsList+='b' ) + - // | '10' ( firstAsList+='a' & secondAsList+='b' ) * - // | '11' ( first?='a' & second?='b' ) ? - // | '12' ( firstAsList+='a' & secondAsList+='b' ) ( firstAsList+='a' & secondAsList+='b' ) | '13' ( firstAsList+='a' - // & secondAsList+='b' ) ? firstAsList+='a' secondAsList+='b' - // | '14' ( ( firstAsList+='a' & secondAsList+='b' ) & ( thirdAsList+='c' & forthAsList+='d' ) ) + + // {Model} ('1' (first?='a' & second?='b') | '2' (first?='a' & second?='b' & third?='c' & forth?='d') | '3' (first?='a' + // ? & second?='b'?) | '4' (first?='a' & second?='b'?) | '5' (first?='a'? & second?='b') | '6' (firstAsList+='a'+ + // & secondAsList+='b'*) | '7' (firstAsList+='a'* & secondAsList+='b'+) | '8' ('a' 'b' first?='c' & 'a' 'b' second?='d' + // ) | '9' (firstAsList+='a' & secondAsList+='b') + + // | '10' (firstAsList+='a' & secondAsList+='b') * + // | '11' (first?='a' & second?='b') ? + // | '12' (firstAsList+='a' & secondAsList+='b') (firstAsList+='a' & secondAsList+='b') | '13' (firstAsList+='a' + // & secondAsList+='b') ? firstAsList+='a' secondAsList+='b' + // | '14' ((firstAsList+='a' & secondAsList+='b') & (thirdAsList+='c' & forthAsList+='d')) + // | 'datatypes' value=UnorderedDatatype // | 'serialization' serialized=UnorderedSerialization // | 'bug302585' nestedModel+=NestedModel*); @@ -1223,7 +1223,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin } //NestedModel: - // {NestedModel} ( first?="a" & second?="b" ) ? + // {NestedModel} (first?="a" & second?="b") ? // 'nested'; public NestedModelElements getNestedModelAccess() { return pNestedModel; @@ -1234,12 +1234,12 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin } //UnorderedDatatype: - // '1' ( 'a' & 'b' ) | '2' ( 'a' & 'b' & 'c' & 'd' ) | '3' ( 'a'? & 'b'? ) | '4' ( 'a' & 'b'? ) | '5' ( 'a'? & 'b' ) | '6' ( - // 'a'+ & 'b'* ) | '7' ( 'a'* & 'b'+ ) | '8' ( 'a' 'b' 'c' & 'a' 'b' 'd' ) | '9' ( 'a' & 'b' ) + - // | '10' ( 'a' & 'b' ) * - // | '11' ( 'a' & 'b' ) ? - // | '12' ( 'a' & 'b' ) ( 'a' & 'b' ) | '13' ( 'a' & 'b' ) ? 'a' 'b' - // | '14' ( ( 'a' & 'b' ) & ( 'c' & 'd' ) ) +; + // '1' ('a' & 'b') | '2' ('a' & 'b' & 'c' & 'd') | '3' ('a'? & 'b'?) | '4' ('a' & 'b'?) | '5' ('a'? & 'b') | '6' ('a'+ + // & 'b'*) | '7' ('a'* & 'b'+) | '8' ('a' 'b' 'c' & 'a' 'b' 'd') | '9' ('a' & 'b') + + // | '10' ('a' & 'b') * + // | '11' ('a' & 'b') ? + // | '12' ('a' & 'b') ('a' & 'b') | '13' ('a' & 'b') ? 'a' 'b' + // | '14' (('a' & 'b') & ('c' & 'd')) +; public UnorderedDatatypeElements getUnorderedDatatypeAccess() { return pUnorderedDatatype; } @@ -1250,9 +1250,9 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFin ///* SuppressWarnings[potentialOverride] */ //UnorderedSerialization: - // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? - // | '2' ( firstAsList+='a' & secondAsList+='b' ) * - // | '3' ( firstAsList+='a'+ & second?='b' ) *); + // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? + // | '2' (firstAsList+='a' & secondAsList+='b') * + // | '3' (firstAsList+='a'+ & second?='b') *); public UnorderedSerializationElements getUnorderedSerializationAccess() { return pUnorderedSerialization; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java index 3a44f611e..4382ef21d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java @@ -59,22 +59,22 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractElementFin private final RuleCall cMinusOperandsTermParserRuleCall_1_1_2_0 = (RuleCall)cMinusOperandsAssignment_1_1_2.eContents().get(0); //Op Expression: - // Term ({Add.addOperands+= current} '+' addOperands+=Term | {Minus.minusOperands+= current} '-' minusOperands+=Term)*; + // Term ({Add.addOperands+=current} '+' addOperands+=Term | {Minus.minusOperands+=current} '-' minusOperands+=Term)*; @Override public ParserRule getRule() { return rule; } - //Term ({Add.addOperands+= current} '+' addOperands+=Term | {Minus.minusOperands+= current} '-' minusOperands+=Term)* + //Term ({Add.addOperands+=current} '+' addOperands+=Term | {Minus.minusOperands+=current} '-' minusOperands+=Term)* public Group getGroup() { return cGroup; } //Term public RuleCall getTermParserRuleCall_0() { return cTermParserRuleCall_0; } - //({Add.addOperands+= current} '+' addOperands+=Term | {Minus.minusOperands+= current} '-' minusOperands+=Term)* + //({Add.addOperands+=current} '+' addOperands+=Term | {Minus.minusOperands+=current} '-' minusOperands+=Term)* public Alternatives getAlternatives_1() { return cAlternatives_1; } - //{Add.addOperands+= current} '+' addOperands+=Term + //{Add.addOperands+=current} '+' addOperands+=Term public Group getGroup_1_0() { return cGroup_1_0; } - //{Add.addOperands+= current} + //{Add.addOperands+=current} public Action getAddAddOperandsAction_1_0_0() { return cAddAddOperandsAction_1_0_0; } //'+' @@ -86,10 +86,10 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractElementFin //Term public RuleCall getAddOperandsTermParserRuleCall_1_0_2_0() { return cAddOperandsTermParserRuleCall_1_0_2_0; } - //{Minus.minusOperands+= current} '-' minusOperands+=Term + //{Minus.minusOperands+=current} '-' minusOperands+=Term public Group getGroup_1_1() { return cGroup_1_1; } - //{Minus.minusOperands+= current} + //{Minus.minusOperands+=current} public Action getMinusMinusOperandsAction_1_1_0() { return cMinusMinusOperandsAction_1_1_0; } //'-' @@ -646,7 +646,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractElementFin } //Op Expression: - // Term ({Add.addOperands+= current} '+' addOperands+=Term | {Minus.minusOperands+= current} '-' minusOperands+=Term)*; + // Term ({Add.addOperands+=current} '+' addOperands+=Term | {Minus.minusOperands+=current} '-' minusOperands+=Term)*; public OpElements getOpAccess() { return pOp; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java index 8d67e07c4..3ba1441b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java @@ -1631,16 +1631,16 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab private final RuleCall cVal4UnorderedGroupValDelegateParserRuleCall_1_3_0 = (RuleCall)cVal4Assignment_1_3.eContents().get(0); //UnorderedGroup: - // "#24" ( val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate ); + // "#24" (val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate); @Override public ParserRule getRule() { return rule; } - //"#24" ( val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate ) + //"#24" (val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate) public Group getGroup() { return cGroup; } //"#24" public Keyword getNumberSignDigitTwoDigitFourKeyword_0() { return cNumberSignDigitTwoDigitFourKeyword_0; } - //( val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate ) + //(val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate) public UnorderedGroup getUnorderedGroup_1() { return cUnorderedGroup_1; } //val1=ID @@ -1744,10 +1744,10 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab private final RuleCall cVal3IDTerminalRuleCall_2_2_1_0 = (RuleCall)cVal3Assignment_2_2_1.eContents().get(0); //UnorderedGroupOptional: - // "#25" {UnorderedGroupOptional} ( ("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)? ); + // "#25" {UnorderedGroupOptional} (("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)?); @Override public ParserRule getRule() { return rule; } - //"#25" {UnorderedGroupOptional} ( ("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)? ) + //"#25" {UnorderedGroupOptional} (("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)?) public Group getGroup() { return cGroup; } //"#25" @@ -1756,7 +1756,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab //{UnorderedGroupOptional} public Action getUnorderedGroupOptionalAction_1() { return cUnorderedGroupOptionalAction_1; } - //( ("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)? ) + //(("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)?) public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; } //("kw1" val1=ID)? @@ -1809,10 +1809,10 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab private final Keyword cVal3Kw3Keyword_2_2_0 = (Keyword)cVal3Assignment_2_2.eContents().get(0); //UnorderedGroupBoolean: - // '#26' {UnorderedGroupBoolean} ( val1?='kw1'? & val2?='kw2'? & val3?='kw3'? ); + // '#26' {UnorderedGroupBoolean} (val1?='kw1'? & val2?='kw2'? & val3?='kw3'?); @Override public ParserRule getRule() { return rule; } - //'#26' {UnorderedGroupBoolean} ( val1?='kw1'? & val2?='kw2'? & val3?='kw3'? ) + //'#26' {UnorderedGroupBoolean} (val1?='kw1'? & val2?='kw2'? & val3?='kw3'?) public Group getGroup() { return cGroup; } //'#26' @@ -1821,7 +1821,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab //{UnorderedGroupBoolean} public Action getUnorderedGroupBooleanAction_1() { return cUnorderedGroupBooleanAction_1; } - //( val1?='kw1'? & val2?='kw2'? & val3?='kw3'? ) + //(val1?='kw1'? & val2?='kw2'? & val3?='kw3'?) public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; } //val1?='kw1'? @@ -3034,7 +3034,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //UnorderedGroup: - // "#24" ( val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate ); + // "#24" (val1=ID & val2=INT & val3=UnorderedGroupVal & val4=UnorderedGroupValDelegate); public UnorderedGroupElements getUnorderedGroupAccess() { return pUnorderedGroup; } @@ -3074,7 +3074,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //UnorderedGroupOptional: - // "#25" {UnorderedGroupOptional} ( ("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)? ); + // "#25" {UnorderedGroupOptional} (("kw1" val1=ID)? & ("kw2" va2=ID)? & ("kw3" val3=ID)?); public UnorderedGroupOptionalElements getUnorderedGroupOptionalAccess() { return pUnorderedGroupOptional; } @@ -3084,7 +3084,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.Ab } //UnorderedGroupBoolean: - // '#26' {UnorderedGroupBoolean} ( val1?='kw1'? & val2?='kw2'? & val3?='kw3'? ); + // '#26' {UnorderedGroupBoolean} (val1?='kw1'? & val2?='kw2'? & val3?='kw3'?); public UnorderedGroupBooleanElements getUnorderedGroupBooleanAccess() { return pUnorderedGroupBoolean; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index 98fba8f3a..1e9d87068 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -580,19 +580,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsConditionalBranchParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0); //Alternatives AbstractElement: - // ConditionalBranch ({Alternatives.elements+= current} ('|' elements+=ConditionalBranch)+)?; + // ConditionalBranch ({Alternatives.elements+=current} ('|' elements+=ConditionalBranch)+)?; @Override public ParserRule getRule() { return rule; } - //ConditionalBranch ({Alternatives.elements+= current} ('|' elements+=ConditionalBranch)+)? + //ConditionalBranch ({Alternatives.elements+=current} ('|' elements+=ConditionalBranch)+)? public Group getGroup() { return cGroup; } //ConditionalBranch public RuleCall getConditionalBranchParserRuleCall_0() { return cConditionalBranchParserRuleCall_0; } - //({Alternatives.elements+= current} ('|' elements+=ConditionalBranch)+)? + //({Alternatives.elements+=current} ('|' elements+=ConditionalBranch)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.elements+= current} + //{Alternatives.elements+=current} public Action getAlternativesElementsAction_1_0() { return cAlternativesElementsAction_1_0; } //('|' elements+=ConditionalBranch)+ @@ -680,19 +680,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsGroupParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0); //UnorderedGroup AbstractElement: - // Group ({UnorderedGroup.elements+= current} ('&' elements+=Group)+)?; + // Group ({UnorderedGroup.elements+=current} ('&' elements+=Group)+)?; @Override public ParserRule getRule() { return rule; } - //Group ({UnorderedGroup.elements+= current} ('&' elements+=Group)+)? + //Group ({UnorderedGroup.elements+=current} ('&' elements+=Group)+)? public Group getGroup() { return cGroup; } //Group public RuleCall getGroupParserRuleCall_0() { return cGroupParserRuleCall_0; } - //({UnorderedGroup.elements+= current} ('&' elements+=Group)+)? + //({UnorderedGroup.elements+=current} ('&' elements+=Group)+)? public Group getGroup_1() { return cGroup_1; } - //{UnorderedGroup.elements+= current} + //{UnorderedGroup.elements+=current} public Action getUnorderedGroupElementsAction_1_0() { return cUnorderedGroupElementsAction_1_0; } //('&' elements+=Group)+ @@ -717,19 +717,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsAbstractTokenParserRuleCall_1_1_0 = (RuleCall)cElementsAssignment_1_1.eContents().get(0); //Group AbstractElement: - // AbstractToken ({Group.elements+= current} elements+=AbstractToken+)?; + // AbstractToken ({Group.elements+=current} elements+=AbstractToken+)?; @Override public ParserRule getRule() { return rule; } - //AbstractToken ({Group.elements+= current} elements+=AbstractToken+)? + //AbstractToken ({Group.elements+=current} elements+=AbstractToken+)? public Group getGroup() { return cGroup; } //AbstractToken public RuleCall getAbstractTokenParserRuleCall_0() { return cAbstractTokenParserRuleCall_0; } - //({Group.elements+= current} elements+=AbstractToken+)? + //({Group.elements+=current} elements+=AbstractToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.elements+= current} + //{Group.elements+=current} public Action getGroupElementsAction_1_0() { return cGroupElementsAction_1_0; } //elements+=AbstractToken+ @@ -902,17 +902,17 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder public RuleCall getParenthesizedElementParserRuleCall_2() { return cParenthesizedElementParserRuleCall_2; } //// Keyword and RuleCall are used inside of Assignable terminal - // // As we do not want to be able to write name==>ID - // // the rules for Keyword and RuleCall have been copied - // PredicatedKeyword + //// As we do not want to be able to write name==>ID + //// the rules for Keyword and RuleCall have been copied + //PredicatedKeyword public RuleCall getPredicatedKeywordParserRuleCall_3() { return cPredicatedKeywordParserRuleCall_3; } //PredicatedRuleCall public RuleCall getPredicatedRuleCallParserRuleCall_4() { return cPredicatedRuleCallParserRuleCall_4; } //// We have to make this one explicit since the ParenthesizedElement does not - // // create an object but we have to set the predicated flag - // PredicatedGroup + //// create an object but we have to set the predicated flag + //PredicatedGroup public RuleCall getPredicatedGroupParserRuleCall_5() { return cPredicatedGroupParserRuleCall_5; } } public class KeywordElements extends AbstractParserRuleElementFinder { @@ -1334,19 +1334,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsAssignableTerminalParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0); //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.elements+= current} ('|' elements+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.elements+=current} ('|' elements+=AssignableTerminal)+)?; @Override public ParserRule getRule() { return rule; } - //AssignableTerminal ({Alternatives.elements+= current} ('|' elements+=AssignableTerminal)+)? + //AssignableTerminal ({Alternatives.elements+=current} ('|' elements+=AssignableTerminal)+)? public Group getGroup() { return cGroup; } //AssignableTerminal public RuleCall getAssignableTerminalParserRuleCall_0() { return cAssignableTerminalParserRuleCall_0; } - //({Alternatives.elements+= current} ('|' elements+=AssignableTerminal)+)? + //({Alternatives.elements+=current} ('|' elements+=AssignableTerminal)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.elements+= current} + //{Alternatives.elements+=current} public Action getAlternativesElementsAction_1_0() { return cAlternativesElementsAction_1_0; } //('|' elements+=AssignableTerminal)+ @@ -1564,19 +1564,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsTerminalGroupParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0); //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.elements+= current} ('|' elements+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.elements+=current} ('|' elements+=TerminalGroup)+)?; @Override public ParserRule getRule() { return rule; } - //TerminalGroup ({Alternatives.elements+= current} ('|' elements+=TerminalGroup)+)? + //TerminalGroup ({Alternatives.elements+=current} ('|' elements+=TerminalGroup)+)? public Group getGroup() { return cGroup; } //TerminalGroup public RuleCall getTerminalGroupParserRuleCall_0() { return cTerminalGroupParserRuleCall_0; } - //({Alternatives.elements+= current} ('|' elements+=TerminalGroup)+)? + //({Alternatives.elements+=current} ('|' elements+=TerminalGroup)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.elements+= current} + //{Alternatives.elements+=current} public Action getAlternativesElementsAction_1_0() { return cAlternativesElementsAction_1_0; } //('|' elements+=TerminalGroup)+ @@ -1601,19 +1601,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsTerminalTokenParserRuleCall_1_1_0 = (RuleCall)cElementsAssignment_1_1.eContents().get(0); //TerminalGroup AbstractElement: - // TerminalToken ({Group.elements+= current} elements+=TerminalToken+)?; + // TerminalToken ({Group.elements+=current} elements+=TerminalToken+)?; @Override public ParserRule getRule() { return rule; } - //TerminalToken ({Group.elements+= current} elements+=TerminalToken+)? + //TerminalToken ({Group.elements+=current} elements+=TerminalToken+)? public Group getGroup() { return cGroup; } //TerminalToken public RuleCall getTerminalTokenParserRuleCall_0() { return cTerminalTokenParserRuleCall_0; } - //({Group.elements+= current} elements+=TerminalToken+)? + //({Group.elements+=current} elements+=TerminalToken+)? public Group getGroup_1() { return cGroup_1; } - //{Group.elements+= current} + //{Group.elements+=current} public Action getGroupElementsAction_1_0() { return cGroupElementsAction_1_0; } //elements+=TerminalToken+ @@ -1897,19 +1897,19 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder private final RuleCall cElementsEnumLiteralDeclarationParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0); //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.elements+= current} ('|' elements+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.elements+=current} ('|' elements+=EnumLiteralDeclaration)+)?; @Override public ParserRule getRule() { return rule; } - //EnumLiteralDeclaration ({Alternatives.elements+= current} ('|' elements+=EnumLiteralDeclaration)+)? + //EnumLiteralDeclaration ({Alternatives.elements+=current} ('|' elements+=EnumLiteralDeclaration)+)? public Group getGroup() { return cGroup; } //EnumLiteralDeclaration public RuleCall getEnumLiteralDeclarationParserRuleCall_0() { return cEnumLiteralDeclarationParserRuleCall_0; } - //({Alternatives.elements+= current} ('|' elements+=EnumLiteralDeclaration)+)? + //({Alternatives.elements+=current} ('|' elements+=EnumLiteralDeclaration)+)? public Group getGroup_1() { return cGroup_1; } - //{Alternatives.elements+= current} + //{Alternatives.elements+=current} public Action getAlternativesElementsAction_1_0() { return cAlternativesElementsAction_1_0; } //('|' elements+=EnumLiteralDeclaration)+ @@ -2243,7 +2243,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //Alternatives AbstractElement: - // ConditionalBranch ({Alternatives.elements+= current} ('|' elements+=ConditionalBranch)+)?; + // ConditionalBranch ({Alternatives.elements+=current} ('|' elements+=ConditionalBranch)+)?; public AlternativesElements getAlternativesAccess() { return pAlternatives; } @@ -2264,7 +2264,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //UnorderedGroup AbstractElement: - // Group ({UnorderedGroup.elements+= current} ('&' elements+=Group)+)?; + // Group ({UnorderedGroup.elements+=current} ('&' elements+=Group)+)?; public UnorderedGroupElements getUnorderedGroupAccess() { return pUnorderedGroup; } @@ -2274,7 +2274,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //Group AbstractElement: - // AbstractToken ({Group.elements+= current} elements+=AbstractToken+)?; + // AbstractToken ({Group.elements+=current} elements+=AbstractToken+)?; public GroupElements getGroupAccess() { return pGroup; } @@ -2465,7 +2465,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //AssignableAlternatives AbstractElement: - // AssignableTerminal ({Alternatives.elements+= current} ('|' elements+=AssignableTerminal)+)?; + // AssignableTerminal ({Alternatives.elements+=current} ('|' elements+=AssignableTerminal)+)?; public AssignableAlternativesElements getAssignableAlternativesAccess() { return pAssignableAlternatives; } @@ -2527,7 +2527,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //TerminalAlternatives AbstractElement: - // TerminalGroup ({Alternatives.elements+= current} ('|' elements+=TerminalGroup)+)?; + // TerminalGroup ({Alternatives.elements+=current} ('|' elements+=TerminalGroup)+)?; public TerminalAlternativesElements getTerminalAlternativesAccess() { return pTerminalAlternatives; } @@ -2537,7 +2537,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //TerminalGroup AbstractElement: - // TerminalToken ({Group.elements+= current} elements+=TerminalToken+)?; + // TerminalToken ({Group.elements+=current} elements+=TerminalToken+)?; public TerminalGroupElements getTerminalGroupAccess() { return pTerminalGroup; } @@ -2650,7 +2650,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder } //EnumLiterals AbstractElement: - // EnumLiteralDeclaration ({Alternatives.elements+= current} ('|' elements+=EnumLiteralDeclaration)+)?; + // EnumLiteralDeclaration ({Alternatives.elements+=current} ('|' elements+=EnumLiteralDeclaration)+)?; public EnumLiteralsElements getEnumLiteralsAccess() { return pEnumLiterals; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java index 5e7146bfe..b66874053 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java @@ -34,19 +34,19 @@ public class ActionTestLanguage2GrammarAccess extends AbstractElementFinder.Abst //// see https://www.eclipse.org/forums/index.php/mv/msg/798729/1407452/#msg_1407452 //ORing: - // Value ({ORing.disjuncts+= current} '|' disjuncts+=Value)*; + // Value ({ORing.disjuncts+=current} '|' disjuncts+=Value)*; @Override public ParserRule getRule() { return rule; } - //Value ({ORing.disjuncts+= current} '|' disjuncts+=Value)* + //Value ({ORing.disjuncts+=current} '|' disjuncts+=Value)* public Group getGroup() { return cGroup; } //Value public RuleCall getValueParserRuleCall_0() { return cValueParserRuleCall_0; } - //({ORing.disjuncts+= current} '|' disjuncts+=Value)* + //({ORing.disjuncts+=current} '|' disjuncts+=Value)* public Group getGroup_1() { return cGroup_1; } - //{ORing.disjuncts+= current} + //{ORing.disjuncts+=current} public Action getORingDisjunctsAction_1_0() { return cORingDisjunctsAction_1_0; } //'|' @@ -120,7 +120,7 @@ public class ActionTestLanguage2GrammarAccess extends AbstractElementFinder.Abst //// see https://www.eclipse.org/forums/index.php/mv/msg/798729/1407452/#msg_1407452 //ORing: - // Value ({ORing.disjuncts+= current} '|' disjuncts+=Value)*; + // Value ({ORing.disjuncts+=current} '|' disjuncts+=Value)*; public ORingElements getORingAccess() { return pORing; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java index b5505d794..3bbdbf99f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java @@ -33,19 +33,19 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF private final RuleCall cExpressionsAdditionParserRuleCall_1_1_0 = (RuleCall)cExpressionsAssignment_1_1.eContents().get(0); //Sequence: - // Addition ({Sequence.expressions+= current} expressions+=Addition)*; + // Addition ({Sequence.expressions+=current} expressions+=Addition)*; @Override public ParserRule getRule() { return rule; } - //Addition ({Sequence.expressions+= current} expressions+=Addition)* + //Addition ({Sequence.expressions+=current} expressions+=Addition)* public Group getGroup() { return cGroup; } //Addition public RuleCall getAdditionParserRuleCall_0() { return cAdditionParserRuleCall_0; } - //({Sequence.expressions+= current} expressions+=Addition)* + //({Sequence.expressions+=current} expressions+=Addition)* public Group getGroup_1() { return cGroup_1; } - //{Sequence.expressions+= current} + //{Sequence.expressions+=current} public Action getSequenceExpressionsAction_1_0() { return cSequenceExpressionsAction_1_0; } //expressions+=Addition @@ -68,19 +68,19 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF private final RuleCall cValuesMultiplicationParserRuleCall_1_2_0 = (RuleCall)cValuesAssignment_1_2.eContents().get(0); //Addition Expression: - // Multiplication ({Op.values+= current} operator=('+' | '-') values+=Multiplication)*; + // Multiplication ({Op.values+=current} operator=('+' | '-') values+=Multiplication)*; @Override public ParserRule getRule() { return rule; } - //Multiplication ({Op.values+= current} operator=('+' | '-') values+=Multiplication)* + //Multiplication ({Op.values+=current} operator=('+' | '-') values+=Multiplication)* public Group getGroup() { return cGroup; } //Multiplication public RuleCall getMultiplicationParserRuleCall_0() { return cMultiplicationParserRuleCall_0; } - //({Op.values+= current} operator=('+' | '-') values+=Multiplication)* + //({Op.values+=current} operator=('+' | '-') values+=Multiplication)* public Group getGroup_1() { return cGroup_1; } - //{Op.values+= current} + //{Op.values+=current} public Action getOpValuesAction_1_0() { return cOpValuesAction_1_0; } //operator=('+' | '-') @@ -115,19 +115,19 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF private final RuleCall cValuesTermParserRuleCall_1_2_0 = (RuleCall)cValuesAssignment_1_2.eContents().get(0); //Multiplication Expression: - // Term ({Op.values+= current} operator=('*' | '/') values+=Term)*; + // Term ({Op.values+=current} operator=('*' | '/') values+=Term)*; @Override public ParserRule getRule() { return rule; } - //Term ({Op.values+= current} operator=('*' | '/') values+=Term)* + //Term ({Op.values+=current} operator=('*' | '/') values+=Term)* public Group getGroup() { return cGroup; } //Term public RuleCall getTermParserRuleCall_0() { return cTermParserRuleCall_0; } - //({Op.values+= current} operator=('*' | '/') values+=Term)* + //({Op.values+=current} operator=('*' | '/') values+=Term)* public Group getGroup_1() { return cGroup_1; } - //{Op.values+= current} + //{Op.values+=current} public Action getOpValuesAction_1_0() { return cOpValuesAction_1_0; } //operator=('*' | '/') @@ -259,7 +259,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF //Sequence: - // Addition ({Sequence.expressions+= current} expressions+=Addition)*; + // Addition ({Sequence.expressions+=current} expressions+=Addition)*; public SequenceElements getSequenceAccess() { return pSequence; } @@ -269,7 +269,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF } //Addition Expression: - // Multiplication ({Op.values+= current} operator=('+' | '-') values+=Multiplication)*; + // Multiplication ({Op.values+=current} operator=('+' | '-') values+=Multiplication)*; public AdditionElements getAdditionAccess() { return pAddition; } @@ -279,7 +279,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementF } //Multiplication Expression: - // Term ({Op.values+= current} operator=('*' | '/') values+=Term)*; + // Term ({Op.values+=current} operator=('*' | '/') values+=Term)*; public MultiplicationElements getMultiplicationAccess() { return pMultiplication; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java index 9e482a959..cebbcde23 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java @@ -99,10 +99,10 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra private final RuleCall cActionFeatureTerminalRuleParserRuleCall_2_1_0 = (RuleCall)cActionFeatureAssignment_2_1.eContents().get(0); //ReducibleRule ReducibleElement: - // "reducible" TerminalRule ({ReducibleComposite.actionFeature+= current} actionFeature+=TerminalRule)?; + // "reducible" TerminalRule ({ReducibleComposite.actionFeature+=current} actionFeature+=TerminalRule)?; @Override public ParserRule getRule() { return rule; } - //"reducible" TerminalRule ({ReducibleComposite.actionFeature+= current} actionFeature+=TerminalRule)? + //"reducible" TerminalRule ({ReducibleComposite.actionFeature+=current} actionFeature+=TerminalRule)? public Group getGroup() { return cGroup; } //"reducible" @@ -111,10 +111,10 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra //TerminalRule public RuleCall getTerminalRuleParserRuleCall_1() { return cTerminalRuleParserRuleCall_1; } - //({ReducibleComposite.actionFeature+= current} actionFeature+=TerminalRule)? + //({ReducibleComposite.actionFeature+=current} actionFeature+=TerminalRule)? public Group getGroup_2() { return cGroup_2; } - //{ReducibleComposite.actionFeature+= current} + //{ReducibleComposite.actionFeature+=current} public Action getReducibleCompositeActionFeatureAction_2_0() { return cReducibleCompositeActionFeatureAction_2_0; } //actionFeature+=TerminalRule @@ -220,7 +220,7 @@ public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGra } //ReducibleRule ReducibleElement: - // "reducible" TerminalRule ({ReducibleComposite.actionFeature+= current} actionFeature+=TerminalRule)?; + // "reducible" TerminalRule ({ReducibleComposite.actionFeature+=current} actionFeature+=TerminalRule)?; public ReducibleRuleElements getReducibleRuleAccess() { return pReducibleRule; } diff --git a/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java b/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java index d47df3711..6da8b5243 100644 --- a/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java +++ b/org.eclipse.xtext/src-gen/org/eclipse/xtext/services/XtextGrammarAccess.java @@ -113,7 +113,8 @@ public class XtextGrammarAccess extends AbstractElementFinder.AbstractGrammarEle //GrammarID public RuleCall getUsedGrammarsGrammarGrammarIDParserRuleCall_2_2_1_0_1() { return cUsedGrammarsGrammarGrammarIDParserRuleCall_2_2_1_0_1; } - //(definesHiddenTokens?='hidden' '(' (hiddenTokens+=[AbstractRule|RuleID] (',' hiddenTokens+=[AbstractRule|RuleID])*)? ')')? + //(definesHiddenTokens?='hidden' '(' (hiddenTokens+=[AbstractRule|RuleID] (',' hiddenTokens+=[AbstractRule|RuleID])*)? ')') + //? public Group getGroup_3() { return cGroup_3; } //definesHiddenTokens?='hidden' @@ -478,7 +479,8 @@ public class XtextGrammarAccess extends AbstractElementFinder.AbstractGrammarEle //TypeRef public RuleCall getTypeTypeRefParserRuleCall_1_1_1_1_0() { return cTypeTypeRefParserRuleCall_1_1_1_1_0; } - //(definesHiddenTokens?='hidden' '(' (hiddenTokens+=[AbstractRule|RuleID] (',' hiddenTokens+=[AbstractRule|RuleID])*)? ')')? + //(definesHiddenTokens?='hidden' '(' (hiddenTokens+=[AbstractRule|RuleID] (',' hiddenTokens+=[AbstractRule|RuleID])*)? ')') + //? public Group getGroup_2() { return cGroup_2; } //definesHiddenTokens?='hidden'