From 76bcf589d196a97ba1bee52eb2fb36cf1ecabca4 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Sun, 31 Jul 2016 18:58:39 +0200 Subject: [PATCH] - escape */ in javadoc of syntactic sequencer. - fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=398890 - added testcase for Bug 398890 - fixed wrong escaping of /* and */ in grammar access Signed-off-by: Christian Dietrich --- .../DummyTestLanguageGrammarAccess.java | 2 +- ...AndReferenceTestLanguageGrammarAccess.java | 2 +- .../EnumRulesTestLanguageGrammarAccess.java | 2 +- ...ultiRuleEnumTestLanguageGrammarAccess.java | 2 +- .../FormatterTestLanguageGrammarAccess.java | 2 +- ...RegionAccessTestLanguageGrammarAccess.java | 2 +- ...coreFragmentTestLanguageGrammarAccess.java | 2 +- .../SubTestLanguageGrammarAccess.java | 2 +- .../SuperTestLanguageGrammarAccess.java | 2 +- ...rammarAccessTestLanguageGrammarAccess.java | 2 +- .../AbstractTestLanguageGrammarAccess.java | 10 +- ...eInheritanceTestLanguageGrammarAccess.java | 2 +- .../ConcreteTestLanguageGrammarAccess.java | 6 +- ...InheritanceTest2LanguageGrammarAccess.java | 2 +- ...InheritanceTest3LanguageGrammarAccess.java | 2 +- .../InheritanceTestLanguageGrammarAccess.java | 2 +- .../IndexTestLanguageGrammarAccess.java | 2 +- .../Bug311337TestLanguageGrammarAccess.java | 2 +- .../LazyLinkingTestLanguageGrammarAccess.java | 10 +- ...eCaseLinkingTestLanguageGrammarAccess.java | 2 +- .../Bug287988TestLanguageGrammarAccess.java | 6 +- .../Bug289059TestLanguageGrammarAccess.java | 2 +- .../Bug313089TestLanguageGrammarAccess.java | 2 +- .../services/Bug362902GrammarAccess.java | 2 +- ...eCaseImportsTestLanguageGrammarAccess.java | 2 +- ...seNamespacesTestLanguageGrammarAccess.java | 2 +- .../ImportUriTestLanguageGrammarAccess.java | 2 +- .../LangATestLanguageGrammarAccess.java | 2 +- ...oreReferenceTestLanguageGrammarAccess.java | 2 +- ...MetamodelRefTestLanguageGrammarAccess.java | 2 +- .../MultiGenMMTestLanguageGrammarAccess.java | 2 +- .../Bug289515TestLanguageGrammarAccess.java | 2 +- .../Bug289524ExTestLanguageGrammarAccess.java | 2 +- .../Bug289524TestLanguageGrammarAccess.java | 2 +- .../Bug296889ExTestLanguageGrammarAccess.java | 6 +- .../Bug296889TestLanguageGrammarAccess.java | 6 +- .../Bug299237TestLanguageGrammarAccess.java | 2 +- .../Bug378967TestLanguageGrammarAccess.java | 2 +- .../Bug443221TestLanguageGrammarAccess.java | 2 +- .../AssignmentsTestLanguageGrammarAccess.java | 2 +- .../Bug287184TestLanguageGrammarAccess.java | 2 +- .../Bug288432TestLanguageGrammarAccess.java | 2 +- .../services/Bug419429GrammarAccess.java | 2 +- ...atatypeRulesTestLanguageGrammarAccess.java | 2 +- .../EpatchTestLanguageGrammarAccess.java | 2 +- .../FragmentTestLanguageExGrammarAccess.java | 2 +- .../FragmentTestLanguageGrammarAccess.java | 2 +- ...ntationAwareTestLanguageGrammarAccess.java | 2 +- .../KeywordsTestLanguageGrammarAccess.java | 2 +- ...NoParametersTestLanguageGrammarAccess.java | 2 +- ...ParametersTestLanguageExGrammarAccess.java | 2 +- .../ParametersTestLanguageGrammarAccess.java | 2 +- ...woParametersTestLanguageGrammarAccess.java | 2 +- .../Bug297105TestLanguageGrammarAccess.java | 2 +- .../Bug317840TestLanguageGrammarAccess.java | 2 +- ...denTerminalsTestLanguageGrammarAccess.java | 2 +- ...erminalRulesTestLanguageGrammarAccess.java | 2 +- .../UnicodeTestLanguageGrammarAccess.java | 2 +- ...extTerminalsTestLanguageGrammarAccess.java | 10 +- ...ingBug325745TestLanguageGrammarAccess.java | 2 +- ...ingBug325745TestLanguageGrammarAccess.java | 2 +- ...rderedGroupsTestLanguageGrammarAccess.java | 4 +- ...ingBug325745TestLanguageGrammarAccess.java | 2 +- ...rderedGroupsTestLanguageGrammarAccess.java | 4 +- ...rderedGroupsTestLanguageGrammarAccess.java | 6 +- .../FormatterTestLanguageGrammarAccess.java | 2 +- .../impl/services/Bug305397GrammarAccess.java | 2 +- ...tAssociationTestLanguageGrammarAccess.java | 2 +- .../Bug299395TestLanguageGrammarAccess.java | 2 +- .../Bug302128TestLanguageGrammarAccess.java | 2 +- ...plexReconstrTestLanguageGrammarAccess.java | 30 +- ...ionBug269362TestLanguageGrammarAccess.java | 2 +- ...izationErrorTestLanguageGrammarAccess.java | 6 +- .../TransientValuesTestGrammarAccess.java | 2 +- ...assignedTextTestLanguageGrammarAccess.java | 2 +- .../services/Bug385636GrammarAccess.java | 2 +- ...jectAtOffsetTestLanguageGrammarAccess.java | 2 +- ...IntegerationTestLanguageGrammarAccess.java | 2 +- ...iveContainerTestLanguageGrammarAccess.java | 2 +- ...tionProviderTestLanguageGrammarAccess.java | 2 +- .../SyntacticSequencerTestLanguage.ecore | 5 + .../SyntacticSequencerTestLanguage.genmodel | 4 + .../SyntacticSequencerTestLanguage.xtextbin | Bin 5643 -> 5787 bytes .../InternalSyntacticSequencerTestLanguage.g | 63 + ...ernalSyntacticSequencerTestLanguage.tokens | 71 +- ...alSyntacticSequencerTestLanguageLexer.java | 582 +++---- ...lSyntacticSequencerTestLanguageParser.java | 1331 ++++++++++------- ...equencerTestLanguageSemanticSequencer.java | 25 +- ...quencerTestLanguageSyntacticSequencer.java | 11 + ...gnmentFinderTestLanguageGrammarAccess.java | 2 +- ...ontextFinderTestLanguageGrammarAccess.java | 2 +- ...kenSequencerTestLanguageGrammarAccess.java | 6 +- .../SequencerTestLanguageGrammarAccess.java | 2 +- ...ticSequencerTestLanguageGrammarAccess.java | 62 +- .../syntacticsequencertest/Bug398890.java | 52 + .../syntacticsequencertest/Model.java | 27 + .../SyntacticsequencertestFactory.java | 9 + .../SyntacticsequencertestPackage.java | 111 +- .../impl/Bug398890Impl.java | 178 +++ .../impl/ModelImpl.java | 72 + .../SyntacticsequencertestFactoryImpl.java | 12 + .../SyntacticsequencertestPackageImpl.java | 46 + .../SyntacticsequencertestAdapterFactory.java | 20 + .../util/SyntacticsequencertestSwitch.java | 23 + ...XtextGrammarTestLanguageGrammarAccess.java | 10 +- .../ActionTestLanguage2GrammarAccess.java | 2 +- .../ActionTestLanguageGrammarAccess.java | 2 +- .../FowlerDslTestLanguageGrammarAccess.java | 6 +- .../LookaheadTestLanguageGrammarAccess.java | 2 +- ...ptionalEmptyTestLanguageGrammarAccess.java | 2 +- ...artialParserTestLanguageGrammarAccess.java | 2 +- ...renceGrammarTestLanguageGrammarAccess.java | 2 +- ...eExpressionsTestLanguageGrammarAccess.java | 2 +- .../services/TestLanguageGrammarAccess.java | 2 +- .../TreeTestLanguageGrammarAccess.java | 2 +- ...axValidationTestLanguageGrammarAccess.java | 26 +- .../services/Bug250313GrammarAccess.java | 2 +- ...ualifiedNameTestLanguageGrammarAccess.java | 2 +- ...ValueFeatureTestLanguageGrammarAccess.java | 2 +- ...gnedRuleCallTestLanguageGrammarAccess.java | 2 +- .../SyntacticSequencerTestLanguage.xtext | 10 +- .../GrammarAccessExtensions.xtend | 2 +- .../serializer/SerializerFragment2.xtend | 2 +- .../GrammarAccessExtensions.java | 4 +- .../serializer/SerializerFragment2.java | 3 +- 125 files changed, 1971 insertions(+), 1074 deletions(-) create mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java create mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java index 238a55a68..63699f37a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java @@ -164,7 +164,7 @@ public class DummyTestLanguageGrammarAccess extends AbstractGrammarElementFinder } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java index cca0665b7..224c1612f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java @@ -181,7 +181,7 @@ public class EnumAndReferenceTestLanguageGrammarAccess extends AbstractGrammarEl } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java index 03e72e210..9a50d09a1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java @@ -243,7 +243,7 @@ public class EnumRulesTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java index 68ea94c7a..da1d601aa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java @@ -278,7 +278,7 @@ public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java index 4e899d78a..752d3ac4f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java @@ -225,7 +225,7 @@ public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java index 5a2bf46bf..3ea0a5810 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java @@ -815,7 +815,7 @@ public class RegionAccessTestLanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java index 37f697d96..e6c1fbc2c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java @@ -130,7 +130,7 @@ public class EcoreFragmentTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java index 398155909..803b98cdb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java @@ -182,7 +182,7 @@ public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java index fbf81b499..bb72e6124 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java @@ -152,7 +152,7 @@ public class SuperTestLanguageGrammarAccess extends AbstractGrammarElementFinder } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java index 9c5c906bc..83e740ba8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java @@ -204,7 +204,7 @@ public class GrammarAccessTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java index 061174aa6..0cbc81e91 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java @@ -51,7 +51,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cElementsOverridableParserRuleParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / AbstractCallOverridenParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallOverridenParserRule mm::AModel: // 'overridemodel' elements+=OverridableParserRule* @Override public ParserRule getRule() { return rule; } @@ -120,7 +120,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cElementsExtendableParserRuleParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / AbstractCallExtendedParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallExtendedParserRule mm::AModel: // 'extendedmodel' elements+=ExtendableParserRule* @Override public ParserRule getRule() { return rule; } @@ -226,7 +226,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin return getInheritedParserRuleAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / AbstractCallOverridenParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallOverridenParserRule mm::AModel: // 'overridemodel' elements+=OverridableParserRule* public AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() { return pAbstractCallOverridenParserRule; @@ -256,7 +256,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin return getOverridableParserRule2Access().getRule(); } - /// * SuppressWarnings[noInstantiation] * / AbstractCallExtendedParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallExtendedParserRule mm::AModel: // 'extendedmodel' elements+=ExtendableParserRule* public AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() { return pAbstractCallExtendedParserRule; @@ -302,7 +302,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java index e03a38949..159658ebe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java @@ -156,7 +156,7 @@ public class BaseInheritanceTestLanguageGrammarAccess extends AbstractGrammarEle } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java index ca4a03fd8..8ce4920b4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java @@ -483,7 +483,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin return getInheritedParserRuleAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / AbstractCallOverridenParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallOverridenParserRule mm::AModel: // 'overridemodel' elements+=super::OverridableParserRule* public AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallOverridenParserRuleAccess(); @@ -493,7 +493,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin return getAbstractCallOverridenParserRuleAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / AbstractCallExtendedParserRule mm::AModel: + ///* SuppressWarnings[noInstantiation] */ AbstractCallExtendedParserRule mm::AModel: // 'extendedmodel' elements+=super::ExtendableParserRule* public AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() { return gaAbstractTestLanguage.getAbstractCallExtendedParserRuleAccess(); @@ -529,7 +529,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java index cc60a673f..85352192e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java @@ -183,7 +183,7 @@ public class InheritanceTest2LanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java index 7ee4f2d4d..f5c2f5e67 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java @@ -263,7 +263,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java index 3584ab000..7b0ca558b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java @@ -192,7 +192,7 @@ public class InheritanceTestLanguageGrammarAccess extends AbstractGrammarElement } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java index b1fd1608d..690487f96 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java @@ -466,7 +466,7 @@ public class IndexTestLanguageGrammarAccess extends AbstractGrammarElementFinder } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java index 2d7a8522a..307cdba37 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java @@ -280,7 +280,7 @@ public class Bug311337TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java index 6a53b6aef..bfcbe39de 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java @@ -68,10 +68,10 @@ public class LazyLinkingTestLanguageGrammarAccess extends AbstractGrammarElement private final RuleCall cUnresolvedProxyPropertyUnresolvedProxyPropertyParserRuleCall_6_0 = (RuleCall)cUnresolvedProxyPropertyAssignment_6.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7); - /// * + ///* // * SuppressWarnings[BidirectionalReference] // * SuppressWarnings[potentialOverride] - // * / Type: + // */ Type: // 'type' name=ID ('extends' ^extends=[Type] '.' parentId=[Property])? ('for' parentId=[Property] 'in' ^extends=[Type])? // '{' // properties+=Property* @@ -297,10 +297,10 @@ public class LazyLinkingTestLanguageGrammarAccess extends AbstractGrammarElement return getModelAccess().getRule(); } - /// * + ///* // * SuppressWarnings[BidirectionalReference] // * SuppressWarnings[potentialOverride] - // * / Type: + // */ Type: // 'type' name=ID ('extends' ^extends=[Type] '.' parentId=[Property])? ('for' parentId=[Property] 'in' ^extends=[Type])? // '{' // properties+=Property* @@ -354,7 +354,7 @@ public class LazyLinkingTestLanguageGrammarAccess extends AbstractGrammarElement } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java index cfaf8c6ee..fb364b524 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java @@ -173,7 +173,7 @@ public class AbstractIgnoreCaseLinkingTestLanguageGrammarAccess extends Abstract } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java index 829357b33..2147473e2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java @@ -52,7 +52,7 @@ public class Bug287988TestLanguageGrammarAccess extends AbstractGrammarElementFi private final Assignment cAttributesAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1); private final RuleCall cAttributesActionAttributeParserRuleCall_5_1_0 = (RuleCall)cAttributesAssignment_5_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // 'actions' attributes+=BaseAttribute* | 'simple' attributes+=SimpleAttribute* | 'rulecall' // attributes+=RuleCallAttribute* | 'rulecall2' attributes+=RuleCallAttribute2* | 'rulecall3' // attributes+=RuleCallAttribute3* | 'inlinedActions' attributes+=ActionAttribute*; @@ -666,7 +666,7 @@ public class Bug287988TestLanguageGrammarAccess extends AbstractGrammarElementFi } - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // 'actions' attributes+=BaseAttribute* | 'simple' attributes+=SimpleAttribute* | 'rulecall' // attributes+=RuleCallAttribute* | 'rulecall2' attributes+=RuleCallAttribute2* | 'rulecall3' // attributes+=RuleCallAttribute3* | 'inlinedActions' attributes+=ActionAttribute*; @@ -818,7 +818,7 @@ public class Bug287988TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java index b15f18ee3..f4ef40b41 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java @@ -170,7 +170,7 @@ public class Bug289059TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java index 455b863cf..12a54f111 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java @@ -238,7 +238,7 @@ public class Bug313089TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java index 285652770..be8a32059 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java @@ -194,7 +194,7 @@ public class Bug362902GrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java index 0e4b40919..8974a2ca7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java @@ -169,7 +169,7 @@ public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarE } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java index bcdbf9202..64d62cdb1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java @@ -169,7 +169,7 @@ public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGramm } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java index b387d28a1..3bcfa4ffd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java @@ -210,7 +210,7 @@ public class ImportUriTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java index 9ef3564d7..dd746e814 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java @@ -254,7 +254,7 @@ public class LangATestLanguageGrammarAccess extends AbstractGrammarElementFinder } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java index ef051b28e..135e93ad2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java @@ -1090,7 +1090,7 @@ public class EcoreReferenceTestLanguageGrammarAccess extends AbstractGrammarElem } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java index ccfa026ec..a9c80726d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java @@ -179,7 +179,7 @@ public class MetamodelRefTestLanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java index 7c61233d5..65b1ccc6b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java @@ -147,7 +147,7 @@ public class MultiGenMMTestLanguageGrammarAccess extends AbstractGrammarElementF } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java index 43a08bf38..7952decc3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java @@ -211,7 +211,7 @@ public class Bug289515TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java index 4eca77d06..feac478a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java @@ -238,7 +238,7 @@ public class Bug289524ExTestLanguageGrammarAccess extends AbstractGrammarElement } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java index d6ac6fd90..8cf7c5807 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java @@ -238,7 +238,7 @@ public class Bug289524TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java index b79931548..2796997fd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java @@ -35,7 +35,7 @@ public class Bug296889ExTestLanguageGrammarAccess extends AbstractGrammarElement private final Assignment cValuesAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cValuesDataTypeExpressionParserRuleCall_1_1_0 = (RuleCall)cValuesAssignment_1_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // "Model" expressions+=Expression* | "DataType" values+=DataTypeExpression*; @Override public ParserRule getRule() { return rule; } @@ -297,7 +297,7 @@ public class Bug296889ExTestLanguageGrammarAccess extends AbstractGrammarElement } - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // "Model" expressions+=Expression* | "DataType" values+=DataTypeExpression*; public ModelElements getModelAccess() { return pModel; @@ -407,7 +407,7 @@ public class Bug296889ExTestLanguageGrammarAccess extends AbstractGrammarElement } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java index 9287e1c80..e0d468860 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java @@ -35,7 +35,7 @@ public class Bug296889TestLanguageGrammarAccess extends AbstractGrammarElementFi private final Assignment cValuesAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cValuesDataTypeExpressionParserRuleCall_1_1_0 = (RuleCall)cValuesAssignment_1_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // "Model" expressions+=Expression* | "DataType" values+=DataTypeExpression*; @Override public ParserRule getRule() { return rule; } @@ -297,7 +297,7 @@ public class Bug296889TestLanguageGrammarAccess extends AbstractGrammarElementFi } - /// * SuppressWarnings[noInstantiation] * / Model: + ///* SuppressWarnings[noInstantiation] */ Model: // "Model" expressions+=Expression* | "DataType" values+=DataTypeExpression*; public ModelElements getModelAccess() { return pModel; @@ -407,7 +407,7 @@ public class Bug296889TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java index 4b852e49d..3fcb36014 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java @@ -121,7 +121,7 @@ public class Bug299237TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java index 537565ea8..dd9c55a33 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java @@ -499,7 +499,7 @@ public class Bug378967TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java index 0c00f2474..98a7acfb1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java @@ -160,7 +160,7 @@ public class Bug443221TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java index d755ca98a..8a75c95f9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java @@ -561,7 +561,7 @@ public class AssignmentsTestLanguageGrammarAccess extends AbstractGrammarElement } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java index 0bb803e06..d0ed6f3b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java @@ -307,7 +307,7 @@ public class Bug287184TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java index cf818f879..8bcba2bce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java @@ -424,7 +424,7 @@ public class Bug288432TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java index 4f7c86806..3d2895ee2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java @@ -112,7 +112,7 @@ public class Bug419429GrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java index 3ca6b0ddb..c80d48efe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java @@ -451,7 +451,7 @@ public class DatatypeRulesTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 7d21b31f9..9d0dafab1 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 @@ -1867,7 +1867,7 @@ public class EpatchTestLanguageGrammarAccess extends AbstractGrammarElementFinde } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java index 000165850..05a8a0a44 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java @@ -321,7 +321,7 @@ public class FragmentTestLanguageExGrammarAccess extends AbstractGrammarElementF } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java index caf783de4..92906cc58 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java @@ -1019,7 +1019,7 @@ public class FragmentTestLanguageGrammarAccess extends AbstractGrammarElementFin } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java index adbae40f4..12581b432 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java @@ -196,7 +196,7 @@ public class IndentationAwareTestLanguageGrammarAccess extends AbstractGrammarEl } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java index 10ad663c3..72eefcd22 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java @@ -171,7 +171,7 @@ public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFin } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java index e3da0b980..1d3ae27d8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java @@ -795,7 +795,7 @@ public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java index 2ca571be5..6b9e38f44 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java @@ -200,7 +200,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 7751e6409..fe6194202 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 @@ -602,7 +602,7 @@ public class ParametersTestLanguageGrammarAccess extends AbstractGrammarElementF } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 d98086f9d..3ea79845a 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 @@ -662,7 +662,7 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java index 312feb43c..389e1b232 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java @@ -335,7 +335,7 @@ public class Bug297105TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java index 42e5f6da1..0c7e51384 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java @@ -238,7 +238,7 @@ public class Bug317840TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java index e49022b05..f9cf1d8b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java @@ -509,7 +509,7 @@ public class HiddenTerminalsTestLanguageGrammarAccess extends AbstractGrammarEle } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return tML_COMMENT; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java index aea39eada..041ec1877 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java @@ -200,7 +200,7 @@ public class TerminalRulesTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return tML_COMMENT; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java index 85523a7f9..1e08521a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java @@ -202,7 +202,7 @@ public class UnicodeTestLanguageGrammarAccess extends AbstractGrammarElementFind } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 60d9d0f5b..f735048b5 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 @@ -585,7 +585,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElem private final Keyword cCardinalityAsteriskKeyword_1_0_1 = (Keyword)cCardinalityAlternatives_1_0.eContents().get(1); private final Keyword cCardinalityPlusSignKeyword_1_0_2 = (Keyword)cCardinalityAlternatives_1_0.eContents().get(2); - /// * SuppressWarnings[potentialOverride] * / AbstractTokenWithCardinality AbstractElement: + ///* SuppressWarnings[potentialOverride] */ AbstractTokenWithCardinality AbstractElement: // (Assignment | AbstractTerminal) cardinality=('?' | '*' | '+')? @Override public ParserRule getRule() { return rule; } @@ -1094,7 +1094,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElem private final Keyword cCardinalityAsteriskKeyword_1_0_1 = (Keyword)cCardinalityAlternatives_1_0.eContents().get(1); private final Keyword cCardinalityPlusSignKeyword_1_0_2 = (Keyword)cCardinalityAlternatives_1_0.eContents().get(2); - /// * SuppressWarnings[potentialOverride] * / TerminalToken AbstractElement: + ///* SuppressWarnings[potentialOverride] */ TerminalToken AbstractElement: // TerminalTokenElement cardinality=('?' | '*' | '+')? @Override public ParserRule getRule() { return rule; } @@ -1668,7 +1668,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElem return getAbstractTokenAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / AbstractTokenWithCardinality AbstractElement: + ///* SuppressWarnings[potentialOverride] */ AbstractTokenWithCardinality AbstractElement: // (Assignment | AbstractTerminal) cardinality=('?' | '*' | '+')? public AbstractTokenWithCardinalityElements getAbstractTokenWithCardinalityAccess() { return pAbstractTokenWithCardinality; @@ -1820,7 +1820,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElem return getTerminalGroupAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / TerminalToken AbstractElement: + ///* SuppressWarnings[potentialOverride] */ TerminalToken AbstractElement: // TerminalTokenElement cardinality=('?' | '*' | '+')? public TerminalTokenElements getTerminalTokenAccess() { return pTerminalToken; @@ -1952,7 +1952,7 @@ public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElem } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return tML_COMMENT; } 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 df710571a..44b02d037 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 @@ -376,7 +376,7 @@ public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractGram } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 925a75737..b672388d0 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 @@ -166,7 +166,7 @@ public class ExBacktrackingBug325745TestLanguageGrammarAccess extends AbstractGr } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 ec4fedbaa..1e77d1112 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 @@ -137,7 +137,7 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarE return getUnorderedDatatypeAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / UnorderedSerialization: + ///* SuppressWarnings[potentialOverride] */ UnorderedSerialization: // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? // | '2' (firstAsList+='a' & secondAsList+='b')* // | '3' (firstAsList+='a'+ & second?='b')*); @@ -169,7 +169,7 @@ public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarE } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 645de4af1..8e791b6c5 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 @@ -166,7 +166,7 @@ public class SimpleBacktrackingBug325745TestLanguageGrammarAccess extends Abstra } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 15873fcac..65ace232e 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 @@ -137,7 +137,7 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractGram return getUnorderedDatatypeAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / UnorderedSerialization: + ///* SuppressWarnings[potentialOverride] */ UnorderedSerialization: // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? // | '2' (firstAsList+='a' & secondAsList+='b')* // | '3' (firstAsList+='a'+ & second?='b')*); @@ -169,7 +169,7 @@ public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractGram } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 6bb0a023d..bd1d13b85 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 @@ -1045,7 +1045,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarEle private final Assignment cSecondAssignment_1_2_1_1 = (Assignment)cUnorderedGroup_1_2_1.eContents().get(1); private final Keyword cSecondBKeyword_1_2_1_1_0 = (Keyword)cSecondAssignment_1_2_1_1.eContents().get(0); - /// * SuppressWarnings[potentialOverride] * / UnorderedSerialization: + ///* SuppressWarnings[potentialOverride] */ UnorderedSerialization: // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? // | '2' (firstAsList+='a' & secondAsList+='b')* // | '3' (firstAsList+='a'+ & second?='b')*); @@ -1233,7 +1233,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarEle return getUnorderedDatatypeAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / UnorderedSerialization: + ///* SuppressWarnings[potentialOverride] */ UnorderedSerialization: // {UnorderedSerialization} ('1' first?='a'? & second?='b'? & third?='c'? & forth?='d'? // | '2' (firstAsList+='a' & secondAsList+='b')* // | '3' (firstAsList+='a'+ & second?='b')*); @@ -1265,7 +1265,7 @@ public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarEle } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java index 7e095c39f..1e26f628b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java @@ -1183,7 +1183,7 @@ public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java index 5bd3919f9..7e0f6d144 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java @@ -173,7 +173,7 @@ public class Bug305397GrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java index f20d76354..d054ef44a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java @@ -165,7 +165,7 @@ public class CommentAssociationTestLanguageGrammarAccess extends AbstractGrammar } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java index 08e2d5cac..5c104f49a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java @@ -237,7 +237,7 @@ public class Bug299395TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java index 74f959c1e..67830e55d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java @@ -212,7 +212,7 @@ public class Bug302128TestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 91b74771d..825138142 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 @@ -144,7 +144,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle private final Assignment cEmAssignment_3 = (Assignment)cGroup.eContents().get(3); private final Keyword cEmExclamationMarkKeyword_3_0 = (Keyword)cEmAssignment_3.eContents().get(0); - /// * SuppressWarnings[potentialOverride] * / Parens Expression: + ///* SuppressWarnings[potentialOverride] */ Parens Expression: // '(' Op ')' em='!'? @Override public ParserRule getRule() { return rule; } @@ -178,13 +178,13 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle private final Assignment cTypeAssignment_2 = (Assignment)cGroup.eContents().get(2); private final RuleCall cTypeINTTerminalRuleCall_2_0 = (RuleCall)cTypeAssignment_2.eContents().get(0); - /// * TODO not working yet + ///* TODO not working yet //StrangeStuff : // '->' (foo=ID)? ({OtherStuff.strangeStuff=current} ',' bla=ID)? ({OtherStuff2.stuff=current} ',' bla2=ID)?; - // * / // disabled, because of https://bugs.eclipse.org/bugs/show_bug.cgi?id=346685 + //*/ // disabled, because of https://bugs.eclipse.org/bugs/show_bug.cgi?id=346685 ////TrickyA returns TypeA1: 'TA' TrickyA1 (name += ID)* ({TypeB.x=current} 'x' | {TypeC.x=current} 'y')? name+=STRING; ////TrickyA1 returns TypeD: name+=ID; - /// * SuppressWarnings[noInstantiation] * / TrickyB: + ///* SuppressWarnings[noInstantiation] */ TrickyB: // 'TB' (name=ID type+=INT)? type+=INT*; @Override public ParserRule getRule() { return rule; } @@ -293,7 +293,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle private final Assignment cTypeAssignment_3 = (Assignment)cGroup.eContents().get(3); private final RuleCall cTypeIDTerminalRuleCall_3_0 = (RuleCall)cTypeAssignment_3.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / TrickyD: + ///* SuppressWarnings[noInstantiation] */ TrickyD: // 'TD' (name+=INT foo=STRING type+=ID)? (name+=INT type+=ID)? type+=ID*; @Override public ParserRule getRule() { return rule; } @@ -364,7 +364,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle private final RuleCall cTypeIDTerminalRuleCall_3_1_0 = (RuleCall)cTypeAssignment_3_1.eContents().get(0); //// 34 "abc" XX 123 "de" YY x 34 DD 45 CC - /// * SuppressWarnings[noInstantiation] * / TrickyE: + ///* SuppressWarnings[noInstantiation] */ TrickyE: // 'TE' (name+=INT foo+=STRING type+=ID)* 'x' (name+=INT type+=ID)*; @Override public ParserRule getRule() { return rule; } @@ -505,7 +505,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle private final RuleCall cValsTrickyG2ParserRuleCall_1_1_1_0 = (RuleCall)cValsAssignment_1_1_1.eContents().get(0); private final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); - /// * SuppressWarnings[noInstantiation] * / TrickyG1: + ///* SuppressWarnings[noInstantiation] */ TrickyG1: // '[' (vals+=TrickyG2 (',' vals+=TrickyG2)*)? ']'; @Override public ParserRule getRule() { return rule; } @@ -669,7 +669,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle return getAtomAccess().getRule(); } - /// * SuppressWarnings[potentialOverride] * / Parens Expression: + ///* SuppressWarnings[potentialOverride] */ Parens Expression: // '(' Op ')' em='!'? public ParensElements getParensAccess() { return pParens; @@ -679,13 +679,13 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle return getParensAccess().getRule(); } - /// * TODO not working yet + ///* TODO not working yet //StrangeStuff : // '->' (foo=ID)? ({OtherStuff.strangeStuff=current} ',' bla=ID)? ({OtherStuff2.stuff=current} ',' bla2=ID)?; - // * / // disabled, because of https://bugs.eclipse.org/bugs/show_bug.cgi?id=346685 + //*/ // disabled, because of https://bugs.eclipse.org/bugs/show_bug.cgi?id=346685 ////TrickyA returns TypeA1: 'TA' TrickyA1 (name += ID)* ({TypeB.x=current} 'x' | {TypeC.x=current} 'y')? name+=STRING; ////TrickyA1 returns TypeD: name+=ID; - /// * SuppressWarnings[noInstantiation] * / TrickyB: + ///* SuppressWarnings[noInstantiation] */ TrickyB: // 'TB' (name=ID type+=INT)? type+=INT*; public TrickyBElements getTrickyBAccess() { return pTrickyB; @@ -705,7 +705,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle return getTrickyCAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / TrickyD: + ///* SuppressWarnings[noInstantiation] */ TrickyD: // 'TD' (name+=INT foo=STRING type+=ID)? (name+=INT type+=ID)? type+=ID*; public TrickyDElements getTrickyDAccess() { return pTrickyD; @@ -716,7 +716,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle } //// 34 "abc" XX 123 "de" YY x 34 DD 45 CC - /// * SuppressWarnings[noInstantiation] * / TrickyE: + ///* SuppressWarnings[noInstantiation] */ TrickyE: // 'TE' (name+=INT foo+=STRING type+=ID)* 'x' (name+=INT type+=ID)*; public TrickyEElements getTrickyEAccess() { return pTrickyE; @@ -747,7 +747,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle return getTrickyGAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / TrickyG1: + ///* SuppressWarnings[noInstantiation] */ TrickyG1: // '[' (vals+=TrickyG2 (',' vals+=TrickyG2)*)? ']'; public TrickyG1Elements getTrickyG1Access() { return pTrickyG1; @@ -787,7 +787,7 @@ public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarEle } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java index efa3758c7..233a08d79 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java @@ -154,7 +154,7 @@ public class SerializationBug269362TestLanguageGrammarAccess extends AbstractGra } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java index fecc245e9..a6496e008 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java @@ -189,7 +189,7 @@ public class SerializationErrorTestLanguageGrammarAccess extends AbstractGrammar private final RuleCall cIndentIndentParserRuleCall_3_0 = (RuleCall)cIndentAssignment_3.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - /// * SuppressWarnings[noInstantiation] * / Indent: + ///* SuppressWarnings[noInstantiation] */ Indent: // "{" req=TwoRequired? opt=TwoOptions? indent+=Indent* "}"; @Override public ParserRule getRule() { return rule; } @@ -323,7 +323,7 @@ public class SerializationErrorTestLanguageGrammarAccess extends AbstractGrammar return getTwoOptionsAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / Indent: + ///* SuppressWarnings[noInstantiation] */ Indent: // "{" req=TwoRequired? opt=TwoOptions? indent+=Indent* "}"; public IndentElements getIndentAccess() { return pIndent; @@ -353,7 +353,7 @@ public class SerializationErrorTestLanguageGrammarAccess extends AbstractGrammar } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java index b03e9529c..785afc886 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java @@ -268,7 +268,7 @@ public class TransientValuesTestGrammarAccess extends AbstractGrammarElementFind } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java index 7ccc3cc6a..2707b878d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java @@ -423,7 +423,7 @@ public class UnassignedTextTestLanguageGrammarAccess extends AbstractGrammarElem } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java index 13c8a17e5..82f3b5a80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java @@ -465,7 +465,7 @@ public class Bug385636GrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java index 99029a15d..ea2495c32 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java @@ -378,7 +378,7 @@ public class EObjectAtOffsetTestLanguageGrammarAccess extends AbstractGrammarEle } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java index 3b1449aef..ae98a3cb9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java @@ -107,7 +107,7 @@ public class LiveContainerBuilderIntegerationTestLanguageGrammarAccess extends A } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java index 20ef55716..a78897bbc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java @@ -107,7 +107,7 @@ public class LiveContainerTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java index 556946ab6..debb511c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java @@ -547,7 +547,7 @@ public class LocationProviderTestLanguageGrammarAccess extends AbstractGrammarEl } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.ecore index 4dee3ee84..bc3f65244 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.ecore @@ -30,6 +30,8 @@ containment="true"/> + @@ -98,6 +100,9 @@ + + + + @@ -82,6 +83,9 @@ + + + diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin index cdcd134a86c9758637007ef604eeaf8ef38b02d2..0181d44619fddde7b56b45d4531242b5d192baec 100644 GIT binary patch delta 164 zcmeCynXS9w0xP59hyR%XXdAZ?o&nV9&T)R z;$8h*m>stOwX!m^0~Ky%WMgI4(r093ble8Cku@(dHx+0lGrQyV$%jPU*d5n_3}6HR DDfA=> delta 28 kcmbQO+pV+V0xP5Z='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -919,10 +941,10 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:2034:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalSyntacticSequencerTestLanguage.g:2097:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalSyntacticSequencerTestLanguage.g:2034:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalSyntacticSequencerTestLanguage.g:2097:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -938,7 +960,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:2034:54: '\\\\' . + // InternalSyntacticSequencerTestLanguage.g:2097:54: '\\\\' . { match('\\'); matchAny(); @@ -946,7 +968,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:2034:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalSyntacticSequencerTestLanguage.g:2097:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -989,12 +1011,12 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalSyntacticSequencerTestLanguage.g:2036:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalSyntacticSequencerTestLanguage.g:2036:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalSyntacticSequencerTestLanguage.g:2099:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalSyntacticSequencerTestLanguage.g:2099:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalSyntacticSequencerTestLanguage.g:2036:24: ( options {greedy=false; } : . )* + // InternalSyntacticSequencerTestLanguage.g:2099:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -1019,7 +1041,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:2036:52: . + // InternalSyntacticSequencerTestLanguage.g:2099:52: . { matchAny(); @@ -1049,12 +1071,12 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalSyntacticSequencerTestLanguage.g:2038:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalSyntacticSequencerTestLanguage.g:2038:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalSyntacticSequencerTestLanguage.g:2101:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalSyntacticSequencerTestLanguage.g:2101:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalSyntacticSequencerTestLanguage.g:2038:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalSyntacticSequencerTestLanguage.g:2101:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -1067,7 +1089,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:2038:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalSyntacticSequencerTestLanguage.g:2101:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1087,7 +1109,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } } while (true); - // InternalSyntacticSequencerTestLanguage.g:2038:40: ( ( '\\r' )? '\\n' )? + // InternalSyntacticSequencerTestLanguage.g:2101:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -1096,9 +1118,9 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:2038:41: ( '\\r' )? '\\n' + // InternalSyntacticSequencerTestLanguage.g:2101:41: ( '\\r' )? '\\n' { - // InternalSyntacticSequencerTestLanguage.g:2038:41: ( '\\r' )? + // InternalSyntacticSequencerTestLanguage.g:2101:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -1107,7 +1129,7 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:2038:41: '\\r' + // InternalSyntacticSequencerTestLanguage.g:2101:41: '\\r' { match('\r'); @@ -1139,10 +1161,10 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalSyntacticSequencerTestLanguage.g:2040:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalSyntacticSequencerTestLanguage.g:2040:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalSyntacticSequencerTestLanguage.g:2103:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalSyntacticSequencerTestLanguage.g:2103:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalSyntacticSequencerTestLanguage.g:2040:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalSyntacticSequencerTestLanguage.g:2103:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -1196,8 +1218,8 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalSyntacticSequencerTestLanguage.g:2042:16: ( . ) - // InternalSyntacticSequencerTestLanguage.g:2042:18: . + // InternalSyntacticSequencerTestLanguage.g:2105:16: ( . ) + // InternalSyntacticSequencerTestLanguage.g:2105:18: . { matchAny(); @@ -1212,211 +1234,211 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalSyntacticSequencerTestLanguage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | RULE_TERMINAL_ID | RULE_BOOLEAN_TERMINAL_ID | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt12=38; + // InternalSyntacticSequencerTestLanguage.g:1:8: ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_TERMINAL_ID | RULE_BOOLEAN_TERMINAL_ID | RULE_C_COMMENT_END | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt12=39; alt12 = dfa12.predict(input); switch (alt12) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1:10: T__13 - { - mT__13(); - - } - break; - case 2 : - // InternalSyntacticSequencerTestLanguage.g:1:16: T__14 + // InternalSyntacticSequencerTestLanguage.g:1:10: T__14 { mT__14(); } break; - case 3 : - // InternalSyntacticSequencerTestLanguage.g:1:22: T__15 + case 2 : + // InternalSyntacticSequencerTestLanguage.g:1:16: T__15 { mT__15(); } break; - case 4 : - // InternalSyntacticSequencerTestLanguage.g:1:28: T__16 + case 3 : + // InternalSyntacticSequencerTestLanguage.g:1:22: T__16 { mT__16(); } break; - case 5 : - // InternalSyntacticSequencerTestLanguage.g:1:34: T__17 + case 4 : + // InternalSyntacticSequencerTestLanguage.g:1:28: T__17 { mT__17(); } break; - case 6 : - // InternalSyntacticSequencerTestLanguage.g:1:40: T__18 + case 5 : + // InternalSyntacticSequencerTestLanguage.g:1:34: T__18 { mT__18(); } break; - case 7 : - // InternalSyntacticSequencerTestLanguage.g:1:46: T__19 + case 6 : + // InternalSyntacticSequencerTestLanguage.g:1:40: T__19 { mT__19(); } break; - case 8 : - // InternalSyntacticSequencerTestLanguage.g:1:52: T__20 + case 7 : + // InternalSyntacticSequencerTestLanguage.g:1:46: T__20 { mT__20(); } break; - case 9 : - // InternalSyntacticSequencerTestLanguage.g:1:58: T__21 + case 8 : + // InternalSyntacticSequencerTestLanguage.g:1:52: T__21 { mT__21(); } break; - case 10 : - // InternalSyntacticSequencerTestLanguage.g:1:64: T__22 + case 9 : + // InternalSyntacticSequencerTestLanguage.g:1:58: T__22 { mT__22(); } break; - case 11 : - // InternalSyntacticSequencerTestLanguage.g:1:70: T__23 + case 10 : + // InternalSyntacticSequencerTestLanguage.g:1:64: T__23 { mT__23(); } break; - case 12 : - // InternalSyntacticSequencerTestLanguage.g:1:76: T__24 + case 11 : + // InternalSyntacticSequencerTestLanguage.g:1:70: T__24 { mT__24(); } break; - case 13 : - // InternalSyntacticSequencerTestLanguage.g:1:82: T__25 + case 12 : + // InternalSyntacticSequencerTestLanguage.g:1:76: T__25 { mT__25(); } break; - case 14 : - // InternalSyntacticSequencerTestLanguage.g:1:88: T__26 + case 13 : + // InternalSyntacticSequencerTestLanguage.g:1:82: T__26 { mT__26(); } break; - case 15 : - // InternalSyntacticSequencerTestLanguage.g:1:94: T__27 + case 14 : + // InternalSyntacticSequencerTestLanguage.g:1:88: T__27 { mT__27(); } break; - case 16 : - // InternalSyntacticSequencerTestLanguage.g:1:100: T__28 + case 15 : + // InternalSyntacticSequencerTestLanguage.g:1:94: T__28 { mT__28(); } break; - case 17 : - // InternalSyntacticSequencerTestLanguage.g:1:106: T__29 + case 16 : + // InternalSyntacticSequencerTestLanguage.g:1:100: T__29 { mT__29(); } break; - case 18 : - // InternalSyntacticSequencerTestLanguage.g:1:112: T__30 + case 17 : + // InternalSyntacticSequencerTestLanguage.g:1:106: T__30 { mT__30(); } break; - case 19 : - // InternalSyntacticSequencerTestLanguage.g:1:118: T__31 + case 18 : + // InternalSyntacticSequencerTestLanguage.g:1:112: T__31 { mT__31(); } break; - case 20 : - // InternalSyntacticSequencerTestLanguage.g:1:124: T__32 + case 19 : + // InternalSyntacticSequencerTestLanguage.g:1:118: T__32 { mT__32(); } break; - case 21 : - // InternalSyntacticSequencerTestLanguage.g:1:130: T__33 + case 20 : + // InternalSyntacticSequencerTestLanguage.g:1:124: T__33 { mT__33(); } break; - case 22 : - // InternalSyntacticSequencerTestLanguage.g:1:136: T__34 + case 21 : + // InternalSyntacticSequencerTestLanguage.g:1:130: T__34 { mT__34(); } break; - case 23 : - // InternalSyntacticSequencerTestLanguage.g:1:142: T__35 + case 22 : + // InternalSyntacticSequencerTestLanguage.g:1:136: T__35 { mT__35(); } break; - case 24 : - // InternalSyntacticSequencerTestLanguage.g:1:148: T__36 + case 23 : + // InternalSyntacticSequencerTestLanguage.g:1:142: T__36 { mT__36(); } break; - case 25 : - // InternalSyntacticSequencerTestLanguage.g:1:154: T__37 + case 24 : + // InternalSyntacticSequencerTestLanguage.g:1:148: T__37 { mT__37(); } break; - case 26 : - // InternalSyntacticSequencerTestLanguage.g:1:160: T__38 + case 25 : + // InternalSyntacticSequencerTestLanguage.g:1:154: T__38 { mT__38(); } break; - case 27 : - // InternalSyntacticSequencerTestLanguage.g:1:166: T__39 + case 26 : + // InternalSyntacticSequencerTestLanguage.g:1:160: T__39 { mT__39(); } break; - case 28 : - // InternalSyntacticSequencerTestLanguage.g:1:172: T__40 + case 27 : + // InternalSyntacticSequencerTestLanguage.g:1:166: T__40 { mT__40(); } break; - case 29 : - // InternalSyntacticSequencerTestLanguage.g:1:178: T__41 + case 28 : + // InternalSyntacticSequencerTestLanguage.g:1:172: T__41 { mT__41(); + } + break; + case 29 : + // InternalSyntacticSequencerTestLanguage.g:1:178: T__42 + { + mT__42(); + } break; case 30 : @@ -1434,49 +1456,56 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { } break; case 32 : - // InternalSyntacticSequencerTestLanguage.g:1:226: RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1:226: RULE_C_COMMENT_END + { + mRULE_C_COMMENT_END(); + + } + break; + case 33 : + // InternalSyntacticSequencerTestLanguage.g:1:245: RULE_ID { mRULE_ID(); } break; - case 33 : - // InternalSyntacticSequencerTestLanguage.g:1:234: RULE_INT + case 34 : + // InternalSyntacticSequencerTestLanguage.g:1:253: RULE_INT { mRULE_INT(); } break; - case 34 : - // InternalSyntacticSequencerTestLanguage.g:1:243: RULE_STRING + case 35 : + // InternalSyntacticSequencerTestLanguage.g:1:262: RULE_STRING { mRULE_STRING(); } break; - case 35 : - // InternalSyntacticSequencerTestLanguage.g:1:255: RULE_ML_COMMENT + case 36 : + // InternalSyntacticSequencerTestLanguage.g:1:274: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 36 : - // InternalSyntacticSequencerTestLanguage.g:1:271: RULE_SL_COMMENT + case 37 : + // InternalSyntacticSequencerTestLanguage.g:1:290: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 37 : - // InternalSyntacticSequencerTestLanguage.g:1:287: RULE_WS + case 38 : + // InternalSyntacticSequencerTestLanguage.g:1:306: RULE_WS { mRULE_WS(); } break; - case 38 : - // InternalSyntacticSequencerTestLanguage.g:1:295: RULE_ANY_OTHER + case 39 : + // InternalSyntacticSequencerTestLanguage.g:1:314: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1490,17 +1519,17 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { protected DFA12 dfa12 = new DFA12(this); static final String DFA12_eotS = - "\1\uffff\1\22\1\35\4\uffff\1\35\1\uffff\3\22\2\uffff\3\22\2\uffff\1\61\10\uffff\1\35\5\uffff\1\35\17\uffff\1\73\1\74\1\75\1\76\1\77\1\100\1\101\1\102\1\35\10\uffff\3\35\1\107\1\uffff"; + "\1\uffff\1\22\1\35\3\uffff\1\42\1\35\1\uffff\3\22\2\uffff\3\22\2\uffff\1\62\10\uffff\1\35\6\uffff\1\35\17\uffff\1\74\1\75\1\76\1\77\1\100\1\101\1\102\1\103\1\35\10\uffff\3\35\1\110\1\uffff"; static final String DFA12_eofS = - "\110\uffff"; + "\111\uffff"; static final String DFA12_minS = - "\1\0\1\61\1\167\4\uffff\1\141\1\uffff\2\61\1\101\2\uffff\2\0\1\52\2\uffff\1\60\10\uffff\1\61\5\uffff\1\164\17\uffff\10\60\1\143\10\uffff\1\150\1\145\1\144\1\60\1\uffff"; + "\1\0\1\61\1\167\3\uffff\1\57\1\141\1\uffff\2\61\1\101\2\uffff\2\0\1\52\2\uffff\1\60\10\uffff\1\61\6\uffff\1\164\17\uffff\10\60\1\143\10\uffff\1\150\1\145\1\144\1\60\1\uffff"; static final String DFA12_maxS = - "\1\uffff\1\71\1\167\4\uffff\1\141\1\uffff\2\61\1\172\2\uffff\2\uffff\1\57\2\uffff\1\65\10\uffff\1\70\5\uffff\1\164\17\uffff\10\172\1\143\10\uffff\1\150\1\145\1\144\1\172\1\uffff"; + "\1\uffff\1\71\1\167\3\uffff\1\57\1\141\1\uffff\2\61\1\172\2\uffff\2\uffff\1\57\2\uffff\1\65\10\uffff\1\70\6\uffff\1\164\17\uffff\10\172\1\143\10\uffff\1\150\1\145\1\144\1\172\1\uffff"; static final String DFA12_acceptS = - "\3\uffff\1\7\1\11\1\12\1\14\1\uffff\1\33\3\uffff\1\40\1\41\3\uffff\1\45\1\46\1\uffff\1\6\1\10\1\13\1\15\1\16\1\17\1\21\1\22\1\uffff\1\40\1\7\1\11\1\12\1\14\1\uffff\1\33\1\36\1\37\1\41\1\42\1\43\1\44\1\45\1\23\1\24\1\25\1\26\1\34\1\35\1\1\11\uffff\1\2\1\3\1\4\1\5\1\27\1\30\1\31\1\32\4\uffff\1\20"; + "\3\uffff\1\7\1\11\1\12\2\uffff\1\33\3\uffff\1\41\1\42\3\uffff\1\46\1\47\1\uffff\1\6\1\10\1\13\1\15\1\16\1\17\1\21\1\22\1\uffff\1\41\1\7\1\11\1\12\1\40\1\14\1\uffff\1\33\1\36\1\37\1\42\1\43\1\44\1\45\1\46\1\23\1\24\1\25\1\26\1\34\1\35\1\1\11\uffff\1\2\1\3\1\4\1\5\1\27\1\30\1\31\1\32\4\uffff\1\20"; static final String DFA12_specialS = - "\1\0\15\uffff\1\1\1\2\70\uffff}>"; + "\1\2\15\uffff\1\0\1\1\71\uffff}>"; static final String[] DFA12_transitionS = { "\11\22\2\21\2\22\1\21\22\22\1\21\1\10\1\16\1\1\1\11\1\12\1\22\1\17\1\4\1\5\1\6\1\3\3\22\1\20\12\15\7\22\32\14\3\22\1\13\1\14\1\22\12\14\1\2\1\14\1\7\15\14\uff85\22", "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33", @@ -1508,20 +1537,20 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { "", "", "", + "\1\41", + "\1\43", "", - "\1\42", - "", - "\1\44", "\1\45", + "\1\46", "\32\35\4\uffff\1\35\1\uffff\32\35", "", "", - "\0\47", - "\0\47", - "\1\50\4\uffff\1\51", + "\0\50", + "\0\50", + "\1\51\4\uffff\1\52", "", "", - "\1\53\1\54\1\55\1\56\1\57\1\60", + "\1\54\1\55\1\56\1\57\1\60\1\61", "", "", "", @@ -1530,13 +1559,14 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { "", "", "", - "\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71", + "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72", "", "", "", "", "", - "\1\72", + "", + "\1\73", "", "", "", @@ -1560,18 +1590,18 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", - "\1\103", - "", - "", - "", - "", - "", - "", - "", - "", "\1\104", + "", + "", + "", + "", + "", + "", + "", + "", "\1\105", "\1\106", + "\1\107", "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", "" }; @@ -1606,13 +1636,33 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { this.transition = DFA12_transition; } public String getDescription() { - return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | RULE_TERMINAL_ID | RULE_BOOLEAN_TERMINAL_ID | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_TERMINAL_ID | RULE_BOOLEAN_TERMINAL_ID | RULE_C_COMMENT_END | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch ( s ) { case 0 : + int LA12_14 = input.LA(1); + + s = -1; + if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFF')) ) {s = 40;} + + else s = 18; + + if ( s>=0 ) return s; + break; + case 1 : + int LA12_15 = input.LA(1); + + s = -1; + if ( ((LA12_15>='\u0000' && LA12_15<='\uFFFF')) ) {s = 40;} + + else s = 18; + + if ( s>=0 ) return s; + break; + case 2 : int LA12_0 = input.LA(1); s = -1; @@ -1652,26 +1702,6 @@ public class InternalSyntacticSequencerTestLanguageLexer extends Lexer { else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='&'||(LA12_0>=',' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 18;} - if ( s>=0 ) return s; - break; - case 1 : - int LA12_14 = input.LA(1); - - s = -1; - if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFF')) ) {s = 39;} - - else s = 18; - - if ( s>=0 ) return s; - break; - case 2 : - int LA12_15 = input.LA(1); - - s = -1; - if ( ((LA12_15>='\u0000' && LA12_15<='\uFFFF')) ) {s = 39;} - - else s = 18; - if ( s>=0 ) return s; break; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/parser/antlr/internal/InternalSyntacticSequencerTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/parser/antlr/internal/InternalSyntacticSequencerTestLanguageParser.java index 19546bc1e..db1f2b261 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/parser/antlr/internal/InternalSyntacticSequencerTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/parser/antlr/internal/InternalSyntacticSequencerTestLanguageParser.java @@ -22,10 +22,10 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalSyntacticSequencerTestLanguageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_ID", "RULE_TERMINAL_ID", "RULE_INT", "RULE_BOOLEAN_TERMINAL_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'#1'", "'kw1'", "'kw2'", "'kw3'", "'kw4'", "'#2'", "'+'", "'#3'", "'('", "')'", "'#4'", "'*'", "'#5'", "'#6'", "'#7'", "'matched'", "'#8'", "'#9'", "'#10'", "'#11'", "'#12'", "'#13'", "'kw5'", "'kw6'", "'kw7'", "'kw8'", "'!'", "'#14'", "'#15'" + "", "", "", "", "RULE_ID", "RULE_TERMINAL_ID", "RULE_INT", "RULE_BOOLEAN_TERMINAL_ID", "RULE_C_COMMENT_END", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'#1'", "'kw1'", "'kw2'", "'kw3'", "'kw4'", "'#2'", "'+'", "'#3'", "'('", "')'", "'#4'", "'*'", "'#5'", "'#6'", "'#7'", "'matched'", "'#8'", "'#9'", "'#10'", "'#11'", "'#12'", "'#13'", "'kw5'", "'kw6'", "'kw7'", "'kw8'", "'!'", "'#14'", "'#15'" }; - public static final int RULE_STRING=8; - public static final int RULE_SL_COMMENT=10; + public static final int RULE_STRING=9; + public static final int RULE_SL_COMMENT=11; public static final int T__19=19; public static final int T__15=15; public static final int T__37=37; @@ -36,32 +36,33 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern public static final int T__18=18; public static final int T__33=33; public static final int T__34=34; - public static final int T__13=13; public static final int T__35=35; public static final int T__14=14; public static final int T__36=36; + public static final int RULE_C_COMMENT_END=8; public static final int EOF=-1; public static final int T__30=30; public static final int T__31=31; public static final int T__32=32; public static final int RULE_ID=4; public static final int RULE_BOOLEAN_TERMINAL_ID=7; - public static final int RULE_WS=11; + public static final int RULE_WS=12; public static final int RULE_TERMINAL_ID=5; - public static final int RULE_ANY_OTHER=12; + public static final int RULE_ANY_OTHER=13; public static final int T__26=26; public static final int T__27=27; public static final int T__28=28; public static final int RULE_INT=6; public static final int T__29=29; public static final int T__22=22; - public static final int RULE_ML_COMMENT=9; + public static final int RULE_ML_COMMENT=10; public static final int T__23=23; public static final int T__24=24; public static final int T__25=25; public static final int T__40=40; public static final int T__41=41; public static final int T__20=20; + public static final int T__42=42; public static final int T__21=21; // delegates @@ -144,7 +145,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleModel" - // InternalSyntacticSequencerTestLanguage.g:71:1: ruleModel returns [EObject current=null] : ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:71:1: ruleModel returns [EObject current=null] : ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) | ( (lv_x16_15_0= ruleBug398890 ) ) ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -178,92 +179,99 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern EObject lv_x15_14_0 = null; + EObject lv_x16_15_0 = null; + enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:77:2: ( ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:78:2: ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) ) + // InternalSyntacticSequencerTestLanguage.g:77:2: ( ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) | ( (lv_x16_15_0= ruleBug398890 ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:78:2: ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) | ( (lv_x16_15_0= ruleBug398890 ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:78:2: ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) ) - int alt1=15; + // InternalSyntacticSequencerTestLanguage.g:78:2: ( ( (lv_x1_0_0= ruleMandatoryKeywords ) ) | ( (lv_x2_1_0= ruleExp0 ) ) | ( (lv_x3_2_0= ruleExp1 ) ) | ( (lv_x4_3_0= ruleExp2 ) ) | ( (lv_x5_4_0= ruleSingleCrossReference ) ) | ( (lv_x6_5_0= ruleBooleanAlternative ) ) | ( (lv_x7_6_0= ruleUnassignedDatatype ) ) | ( (lv_x8_7_0= ruleOptionalSingleTransition ) ) | ( (lv_x9_8_0= ruleOptionalManyTransition ) ) | ( (lv_x10_9_0= ruleMandatoryManyTransition ) ) | ( (lv_x11_10_0= ruleAlternativeTransition ) ) | ( (lv_x12_11_0= ruleBooleanValues ) ) | ( (lv_x13_12_0= ruleLongAlternative ) ) | ( (lv_x14_13_0= ruleActionOnly ) ) | ( (lv_x15_14_0= ruleFragmentCaller ) ) | ( (lv_x16_15_0= ruleBug398890 ) ) ) + int alt1=16; switch ( input.LA(1) ) { - case 13: + case 14: { alt1=1; } break; - case 18: + case 19: { alt1=2; } break; - case 20: + case 21: { alt1=3; } break; - case 23: + case 24: { alt1=4; } break; - case 25: + case 26: { alt1=5; } break; - case 26: + case 27: { alt1=6; } break; - case 27: + case 28: { alt1=7; } break; - case 29: + case 30: { alt1=8; } break; - case 30: + case 31: { alt1=9; } break; - case 31: + case 32: { alt1=10; } break; - case 32: + case 33: { alt1=11; } break; - case 33: + case 34: { alt1=12; } break; - case 34: + case 35: { alt1=13; } break; - case 40: + case 41: { alt1=14; } break; - case 41: + case 42: { alt1=15; } break; + case RULE_C_COMMENT_END: + { + alt1=16; + } + break; default: if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = @@ -886,6 +894,47 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } + } + break; + case 16 : + // InternalSyntacticSequencerTestLanguage.g:379:3: ( (lv_x16_15_0= ruleBug398890 ) ) + { + // InternalSyntacticSequencerTestLanguage.g:379:3: ( (lv_x16_15_0= ruleBug398890 ) ) + // InternalSyntacticSequencerTestLanguage.g:380:4: (lv_x16_15_0= ruleBug398890 ) + { + // InternalSyntacticSequencerTestLanguage.g:380:4: (lv_x16_15_0= ruleBug398890 ) + // InternalSyntacticSequencerTestLanguage.g:381:5: lv_x16_15_0= ruleBug398890 + { + if ( state.backtracking==0 ) { + + newCompositeNode(grammarAccess.getModelAccess().getX16Bug398890ParserRuleCall_15_0()); + + } + pushFollow(FollowSets000.FOLLOW_2); + lv_x16_15_0=ruleBug398890(); + + state._fsp--; + if (state.failed) return current; + if ( state.backtracking==0 ) { + + if (current==null) { + current = createModelElementForParent(grammarAccess.getModelRule()); + } + set( + current, + "x16", + lv_x16_15_0, + "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage.Bug398890"); + afterParserOrEnumRuleCall(); + + } + + } + + + } + + } break; @@ -913,7 +962,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleMandatoryKeywords" - // InternalSyntacticSequencerTestLanguage.g:382:1: entryRuleMandatoryKeywords returns [EObject current=null] : iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF ; + // InternalSyntacticSequencerTestLanguage.g:402:1: entryRuleMandatoryKeywords returns [EObject current=null] : iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF ; public final EObject entryRuleMandatoryKeywords() throws RecognitionException { EObject current = null; @@ -921,8 +970,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:382:58: (iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF ) - // InternalSyntacticSequencerTestLanguage.g:383:2: iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF + // InternalSyntacticSequencerTestLanguage.g:402:58: (iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF ) + // InternalSyntacticSequencerTestLanguage.g:403:2: iv_ruleMandatoryKeywords= ruleMandatoryKeywords EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getMandatoryKeywordsRule()); @@ -953,7 +1002,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleMandatoryKeywords" - // InternalSyntacticSequencerTestLanguage.g:389:1: ruleMandatoryKeywords returns [EObject current=null] : (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) ; + // InternalSyntacticSequencerTestLanguage.g:409:1: ruleMandatoryKeywords returns [EObject current=null] : (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) ; public final EObject ruleMandatoryKeywords() throws RecognitionException { EObject current = null; @@ -970,23 +1019,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:395:2: ( (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) ) - // InternalSyntacticSequencerTestLanguage.g:396:2: (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) + // InternalSyntacticSequencerTestLanguage.g:415:2: ( (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) ) + // InternalSyntacticSequencerTestLanguage.g:416:2: (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) { - // InternalSyntacticSequencerTestLanguage.g:396:2: (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) - // InternalSyntacticSequencerTestLanguage.g:397:3: otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' + // InternalSyntacticSequencerTestLanguage.g:416:2: (otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' ) + // InternalSyntacticSequencerTestLanguage.g:417:3: otherlv_0= '#1' ( (lv_val1_1_0= RULE_ID ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= RULE_ID ) ) otherlv_4= 'kw2' otherlv_5= 'kw3' ( (lv_val3_6_0= RULE_ID ) ) otherlv_7= 'kw4' { - otherlv_0=(Token)match(input,13,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_0=(Token)match(input,14,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getMandatoryKeywordsAccess().getNumberSignDigitOneKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:401:3: ( (lv_val1_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:402:4: (lv_val1_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:421:3: ( (lv_val1_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:422:4: (lv_val1_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:402:4: (lv_val1_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:403:5: lv_val1_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:422:4: (lv_val1_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:423:5: lv_val1_1_0= RULE_ID { lv_val1_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -1012,17 +1061,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_2=(Token)match(input,14,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_2=(Token)match(input,15,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getMandatoryKeywordsAccess().getKw1Keyword_2()); } - // InternalSyntacticSequencerTestLanguage.g:423:3: ( (lv_val2_3_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:424:4: (lv_val2_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:443:3: ( (lv_val2_3_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:444:4: (lv_val2_3_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:424:4: (lv_val2_3_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:425:5: lv_val2_3_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:444:4: (lv_val2_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:445:5: lv_val2_3_0= RULE_ID { lv_val2_3_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_5); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -1048,23 +1097,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_4=(Token)match(input,15,FollowSets000.FOLLOW_6); if (state.failed) return current; + otherlv_4=(Token)match(input,16,FollowSets000.FOLLOW_6); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getMandatoryKeywordsAccess().getKw2Keyword_4()); } - otherlv_5=(Token)match(input,16,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_5=(Token)match(input,17,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getMandatoryKeywordsAccess().getKw3Keyword_5()); } - // InternalSyntacticSequencerTestLanguage.g:449:3: ( (lv_val3_6_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:450:4: (lv_val3_6_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:469:3: ( (lv_val3_6_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:470:4: (lv_val3_6_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:450:4: (lv_val3_6_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:451:5: lv_val3_6_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:470:4: (lv_val3_6_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:471:5: lv_val3_6_0= RULE_ID { lv_val3_6_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_7); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -1090,7 +1139,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_7=(Token)match(input,17,FollowSets000.FOLLOW_2); if (state.failed) return current; + otherlv_7=(Token)match(input,18,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_7, grammarAccess.getMandatoryKeywordsAccess().getKw4Keyword_7()); @@ -1121,7 +1170,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleExp0" - // InternalSyntacticSequencerTestLanguage.g:475:1: entryRuleExp0 returns [EObject current=null] : iv_ruleExp0= ruleExp0 EOF ; + // InternalSyntacticSequencerTestLanguage.g:495:1: entryRuleExp0 returns [EObject current=null] : iv_ruleExp0= ruleExp0 EOF ; public final EObject entryRuleExp0() throws RecognitionException { EObject current = null; @@ -1129,8 +1178,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:475:45: (iv_ruleExp0= ruleExp0 EOF ) - // InternalSyntacticSequencerTestLanguage.g:476:2: iv_ruleExp0= ruleExp0 EOF + // InternalSyntacticSequencerTestLanguage.g:495:45: (iv_ruleExp0= ruleExp0 EOF ) + // InternalSyntacticSequencerTestLanguage.g:496:2: iv_ruleExp0= ruleExp0 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getExp0Rule()); @@ -1161,7 +1210,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleExp0" - // InternalSyntacticSequencerTestLanguage.g:482:1: ruleExp0 returns [EObject current=null] : (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) ; + // InternalSyntacticSequencerTestLanguage.g:502:1: ruleExp0 returns [EObject current=null] : (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) ; public final EObject ruleExp0() throws RecognitionException { EObject current = null; @@ -1173,13 +1222,13 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:488:2: ( (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) ) - // InternalSyntacticSequencerTestLanguage.g:489:2: (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) + // InternalSyntacticSequencerTestLanguage.g:508:2: ( (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) ) + // InternalSyntacticSequencerTestLanguage.g:509:2: (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) { - // InternalSyntacticSequencerTestLanguage.g:489:2: (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) - // InternalSyntacticSequencerTestLanguage.g:490:3: otherlv_0= '#2' this_Addition0_1= ruleAddition0 + // InternalSyntacticSequencerTestLanguage.g:509:2: (otherlv_0= '#2' this_Addition0_1= ruleAddition0 ) + // InternalSyntacticSequencerTestLanguage.g:510:3: otherlv_0= '#2' this_Addition0_1= ruleAddition0 { - otherlv_0=(Token)match(input,18,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_0=(Token)match(input,19,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getExp0Access().getNumberSignDigitTwoKeyword_0()); @@ -1226,7 +1275,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleAddition0" - // InternalSyntacticSequencerTestLanguage.g:506:1: entryRuleAddition0 returns [EObject current=null] : iv_ruleAddition0= ruleAddition0 EOF ; + // InternalSyntacticSequencerTestLanguage.g:526:1: entryRuleAddition0 returns [EObject current=null] : iv_ruleAddition0= ruleAddition0 EOF ; public final EObject entryRuleAddition0() throws RecognitionException { EObject current = null; @@ -1234,8 +1283,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:506:50: (iv_ruleAddition0= ruleAddition0 EOF ) - // InternalSyntacticSequencerTestLanguage.g:507:2: iv_ruleAddition0= ruleAddition0 EOF + // InternalSyntacticSequencerTestLanguage.g:526:50: (iv_ruleAddition0= ruleAddition0 EOF ) + // InternalSyntacticSequencerTestLanguage.g:527:2: iv_ruleAddition0= ruleAddition0 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getAddition0Rule()); @@ -1266,7 +1315,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleAddition0" - // InternalSyntacticSequencerTestLanguage.g:513:1: ruleAddition0 returns [EObject current=null] : (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) ; + // InternalSyntacticSequencerTestLanguage.g:533:1: ruleAddition0 returns [EObject current=null] : (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) ; public final EObject ruleAddition0() throws RecognitionException { EObject current = null; @@ -1280,11 +1329,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:519:2: ( (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) ) - // InternalSyntacticSequencerTestLanguage.g:520:2: (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:539:2: ( (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) ) + // InternalSyntacticSequencerTestLanguage.g:540:2: (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) { - // InternalSyntacticSequencerTestLanguage.g:520:2: (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) - // InternalSyntacticSequencerTestLanguage.g:521:3: this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:540:2: (this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:541:3: this_Prim0_0= rulePrim0 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* { if ( state.backtracking==0 ) { @@ -1302,23 +1351,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - // InternalSyntacticSequencerTestLanguage.g:529:3: ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:549:3: ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) )* loop2: do { int alt2=2; int LA2_0 = input.LA(1); - if ( (LA2_0==19) ) { + if ( (LA2_0==20) ) { alt2=1; } switch (alt2) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:530:4: () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) + // InternalSyntacticSequencerTestLanguage.g:550:4: () otherlv_2= '+' ( (lv_right_3_0= rulePrim0 ) ) { - // InternalSyntacticSequencerTestLanguage.g:530:4: () - // InternalSyntacticSequencerTestLanguage.g:531:5: + // InternalSyntacticSequencerTestLanguage.g:550:4: () + // InternalSyntacticSequencerTestLanguage.g:551:5: { if ( state.backtracking==0 ) { @@ -1330,17 +1379,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_2=(Token)match(input,19,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_2=(Token)match(input,20,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getAddition0Access().getPlusSignKeyword_1_1()); } - // InternalSyntacticSequencerTestLanguage.g:541:4: ( (lv_right_3_0= rulePrim0 ) ) - // InternalSyntacticSequencerTestLanguage.g:542:5: (lv_right_3_0= rulePrim0 ) + // InternalSyntacticSequencerTestLanguage.g:561:4: ( (lv_right_3_0= rulePrim0 ) ) + // InternalSyntacticSequencerTestLanguage.g:562:5: (lv_right_3_0= rulePrim0 ) { - // InternalSyntacticSequencerTestLanguage.g:542:5: (lv_right_3_0= rulePrim0 ) - // InternalSyntacticSequencerTestLanguage.g:543:6: lv_right_3_0= rulePrim0 + // InternalSyntacticSequencerTestLanguage.g:562:5: (lv_right_3_0= rulePrim0 ) + // InternalSyntacticSequencerTestLanguage.g:563:6: lv_right_3_0= rulePrim0 { if ( state.backtracking==0 ) { @@ -1405,7 +1454,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRulePrim0" - // InternalSyntacticSequencerTestLanguage.g:565:1: entryRulePrim0 returns [EObject current=null] : iv_rulePrim0= rulePrim0 EOF ; + // InternalSyntacticSequencerTestLanguage.g:585:1: entryRulePrim0 returns [EObject current=null] : iv_rulePrim0= rulePrim0 EOF ; public final EObject entryRulePrim0() throws RecognitionException { EObject current = null; @@ -1413,8 +1462,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:565:46: (iv_rulePrim0= rulePrim0 EOF ) - // InternalSyntacticSequencerTestLanguage.g:566:2: iv_rulePrim0= rulePrim0 EOF + // InternalSyntacticSequencerTestLanguage.g:585:46: (iv_rulePrim0= rulePrim0 EOF ) + // InternalSyntacticSequencerTestLanguage.g:586:2: iv_rulePrim0= rulePrim0 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPrim0Rule()); @@ -1445,7 +1494,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "rulePrim0" - // InternalSyntacticSequencerTestLanguage.g:572:1: rulePrim0 returns [EObject current=null] : ( () ( (lv_name_1_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:592:1: rulePrim0 returns [EObject current=null] : ( () ( (lv_name_1_0= RULE_ID ) ) ) ; public final EObject rulePrim0() throws RecognitionException { EObject current = null; @@ -1455,14 +1504,14 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:578:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:579:2: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:598:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:599:2: ( () ( (lv_name_1_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:579:2: ( () ( (lv_name_1_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:580:3: () ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:599:2: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:600:3: () ( (lv_name_1_0= RULE_ID ) ) { - // InternalSyntacticSequencerTestLanguage.g:580:3: () - // InternalSyntacticSequencerTestLanguage.g:581:4: + // InternalSyntacticSequencerTestLanguage.g:600:3: () + // InternalSyntacticSequencerTestLanguage.g:601:4: { if ( state.backtracking==0 ) { @@ -1474,11 +1523,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:587:3: ( (lv_name_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:588:4: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:607:3: ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:608:4: (lv_name_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:588:4: (lv_name_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:589:5: lv_name_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:608:4: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:609:5: lv_name_1_0= RULE_ID { lv_name_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -1529,7 +1578,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleExp1" - // InternalSyntacticSequencerTestLanguage.g:609:1: entryRuleExp1 returns [EObject current=null] : iv_ruleExp1= ruleExp1 EOF ; + // InternalSyntacticSequencerTestLanguage.g:629:1: entryRuleExp1 returns [EObject current=null] : iv_ruleExp1= ruleExp1 EOF ; public final EObject entryRuleExp1() throws RecognitionException { EObject current = null; @@ -1537,8 +1586,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:609:45: (iv_ruleExp1= ruleExp1 EOF ) - // InternalSyntacticSequencerTestLanguage.g:610:2: iv_ruleExp1= ruleExp1 EOF + // InternalSyntacticSequencerTestLanguage.g:629:45: (iv_ruleExp1= ruleExp1 EOF ) + // InternalSyntacticSequencerTestLanguage.g:630:2: iv_ruleExp1= ruleExp1 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getExp1Rule()); @@ -1569,7 +1618,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleExp1" - // InternalSyntacticSequencerTestLanguage.g:616:1: ruleExp1 returns [EObject current=null] : (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) ; + // InternalSyntacticSequencerTestLanguage.g:636:1: ruleExp1 returns [EObject current=null] : (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) ; public final EObject ruleExp1() throws RecognitionException { EObject current = null; @@ -1581,13 +1630,13 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:622:2: ( (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) ) - // InternalSyntacticSequencerTestLanguage.g:623:2: (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) + // InternalSyntacticSequencerTestLanguage.g:642:2: ( (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) ) + // InternalSyntacticSequencerTestLanguage.g:643:2: (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) { - // InternalSyntacticSequencerTestLanguage.g:623:2: (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) - // InternalSyntacticSequencerTestLanguage.g:624:3: otherlv_0= '#3' this_Addition1_1= ruleAddition1 + // InternalSyntacticSequencerTestLanguage.g:643:2: (otherlv_0= '#3' this_Addition1_1= ruleAddition1 ) + // InternalSyntacticSequencerTestLanguage.g:644:3: otherlv_0= '#3' this_Addition1_1= ruleAddition1 { - otherlv_0=(Token)match(input,20,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_0=(Token)match(input,21,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getExp1Access().getNumberSignDigitThreeKeyword_0()); @@ -1634,7 +1683,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleAddition1" - // InternalSyntacticSequencerTestLanguage.g:640:1: entryRuleAddition1 returns [EObject current=null] : iv_ruleAddition1= ruleAddition1 EOF ; + // InternalSyntacticSequencerTestLanguage.g:660:1: entryRuleAddition1 returns [EObject current=null] : iv_ruleAddition1= ruleAddition1 EOF ; public final EObject entryRuleAddition1() throws RecognitionException { EObject current = null; @@ -1642,8 +1691,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:640:50: (iv_ruleAddition1= ruleAddition1 EOF ) - // InternalSyntacticSequencerTestLanguage.g:641:2: iv_ruleAddition1= ruleAddition1 EOF + // InternalSyntacticSequencerTestLanguage.g:660:50: (iv_ruleAddition1= ruleAddition1 EOF ) + // InternalSyntacticSequencerTestLanguage.g:661:2: iv_ruleAddition1= ruleAddition1 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getAddition1Rule()); @@ -1674,7 +1723,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleAddition1" - // InternalSyntacticSequencerTestLanguage.g:647:1: ruleAddition1 returns [EObject current=null] : (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) ; + // InternalSyntacticSequencerTestLanguage.g:667:1: ruleAddition1 returns [EObject current=null] : (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) ; public final EObject ruleAddition1() throws RecognitionException { EObject current = null; @@ -1688,11 +1737,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:653:2: ( (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) ) - // InternalSyntacticSequencerTestLanguage.g:654:2: (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:673:2: ( (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) ) + // InternalSyntacticSequencerTestLanguage.g:674:2: (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) { - // InternalSyntacticSequencerTestLanguage.g:654:2: (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) - // InternalSyntacticSequencerTestLanguage.g:655:3: this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:674:2: (this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:675:3: this_Prim1_0= rulePrim1 ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* { if ( state.backtracking==0 ) { @@ -1710,23 +1759,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - // InternalSyntacticSequencerTestLanguage.g:663:3: ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:683:3: ( () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) )* loop3: do { int alt3=2; int LA3_0 = input.LA(1); - if ( (LA3_0==19) ) { + if ( (LA3_0==20) ) { alt3=1; } switch (alt3) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:664:4: () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) + // InternalSyntacticSequencerTestLanguage.g:684:4: () otherlv_2= '+' ( (lv_right_3_0= rulePrim1 ) ) { - // InternalSyntacticSequencerTestLanguage.g:664:4: () - // InternalSyntacticSequencerTestLanguage.g:665:5: + // InternalSyntacticSequencerTestLanguage.g:684:4: () + // InternalSyntacticSequencerTestLanguage.g:685:5: { if ( state.backtracking==0 ) { @@ -1738,17 +1787,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_2=(Token)match(input,19,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_2=(Token)match(input,20,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getAddition1Access().getPlusSignKeyword_1_1()); } - // InternalSyntacticSequencerTestLanguage.g:675:4: ( (lv_right_3_0= rulePrim1 ) ) - // InternalSyntacticSequencerTestLanguage.g:676:5: (lv_right_3_0= rulePrim1 ) + // InternalSyntacticSequencerTestLanguage.g:695:4: ( (lv_right_3_0= rulePrim1 ) ) + // InternalSyntacticSequencerTestLanguage.g:696:5: (lv_right_3_0= rulePrim1 ) { - // InternalSyntacticSequencerTestLanguage.g:676:5: (lv_right_3_0= rulePrim1 ) - // InternalSyntacticSequencerTestLanguage.g:677:6: lv_right_3_0= rulePrim1 + // InternalSyntacticSequencerTestLanguage.g:696:5: (lv_right_3_0= rulePrim1 ) + // InternalSyntacticSequencerTestLanguage.g:697:6: lv_right_3_0= rulePrim1 { if ( state.backtracking==0 ) { @@ -1813,7 +1862,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRulePrim1" - // InternalSyntacticSequencerTestLanguage.g:699:1: entryRulePrim1 returns [EObject current=null] : iv_rulePrim1= rulePrim1 EOF ; + // InternalSyntacticSequencerTestLanguage.g:719:1: entryRulePrim1 returns [EObject current=null] : iv_rulePrim1= rulePrim1 EOF ; public final EObject entryRulePrim1() throws RecognitionException { EObject current = null; @@ -1821,8 +1870,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:699:46: (iv_rulePrim1= rulePrim1 EOF ) - // InternalSyntacticSequencerTestLanguage.g:700:2: iv_rulePrim1= rulePrim1 EOF + // InternalSyntacticSequencerTestLanguage.g:719:46: (iv_rulePrim1= rulePrim1 EOF ) + // InternalSyntacticSequencerTestLanguage.g:720:2: iv_rulePrim1= rulePrim1 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPrim1Rule()); @@ -1853,7 +1902,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "rulePrim1" - // InternalSyntacticSequencerTestLanguage.g:706:1: rulePrim1 returns [EObject current=null] : ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) ; + // InternalSyntacticSequencerTestLanguage.g:726:1: rulePrim1 returns [EObject current=null] : ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) ; public final EObject rulePrim1() throws RecognitionException { EObject current = null; @@ -1867,17 +1916,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:712:2: ( ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) ) - // InternalSyntacticSequencerTestLanguage.g:713:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) + // InternalSyntacticSequencerTestLanguage.g:732:2: ( ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) ) + // InternalSyntacticSequencerTestLanguage.g:733:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) { - // InternalSyntacticSequencerTestLanguage.g:713:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) + // InternalSyntacticSequencerTestLanguage.g:733:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) ) int alt4=2; int LA4_0 = input.LA(1); if ( (LA4_0==RULE_ID) ) { alt4=1; } - else if ( (LA4_0==21) ) { + else if ( (LA4_0==22) ) { alt4=2; } else { @@ -1889,13 +1938,13 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt4) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:714:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:734:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:714:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:715:4: () ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:734:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:735:4: () ( (lv_name_1_0= RULE_ID ) ) { - // InternalSyntacticSequencerTestLanguage.g:715:4: () - // InternalSyntacticSequencerTestLanguage.g:716:5: + // InternalSyntacticSequencerTestLanguage.g:735:4: () + // InternalSyntacticSequencerTestLanguage.g:736:5: { if ( state.backtracking==0 ) { @@ -1907,11 +1956,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:722:4: ( (lv_name_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:723:5: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:742:4: ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:743:5: (lv_name_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:723:5: (lv_name_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:724:6: lv_name_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:743:5: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:744:6: lv_name_1_0= RULE_ID { lv_name_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -1944,12 +1993,12 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:742:3: (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) + // InternalSyntacticSequencerTestLanguage.g:762:3: (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) { - // InternalSyntacticSequencerTestLanguage.g:742:3: (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) - // InternalSyntacticSequencerTestLanguage.g:743:4: otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' + // InternalSyntacticSequencerTestLanguage.g:762:3: (otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' ) + // InternalSyntacticSequencerTestLanguage.g:763:4: otherlv_2= '(' this_Addition1_3= ruleAddition1 otherlv_4= ')' { - otherlv_2=(Token)match(input,21,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_2=(Token)match(input,22,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getPrim1Access().getLeftParenthesisKeyword_1_0()); @@ -1971,7 +2020,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - otherlv_4=(Token)match(input,22,FollowSets000.FOLLOW_2); if (state.failed) return current; + otherlv_4=(Token)match(input,23,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getPrim1Access().getRightParenthesisKeyword_1_2()); @@ -2008,7 +2057,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleExp2" - // InternalSyntacticSequencerTestLanguage.g:764:1: entryRuleExp2 returns [EObject current=null] : iv_ruleExp2= ruleExp2 EOF ; + // InternalSyntacticSequencerTestLanguage.g:784:1: entryRuleExp2 returns [EObject current=null] : iv_ruleExp2= ruleExp2 EOF ; public final EObject entryRuleExp2() throws RecognitionException { EObject current = null; @@ -2016,8 +2065,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:764:45: (iv_ruleExp2= ruleExp2 EOF ) - // InternalSyntacticSequencerTestLanguage.g:765:2: iv_ruleExp2= ruleExp2 EOF + // InternalSyntacticSequencerTestLanguage.g:784:45: (iv_ruleExp2= ruleExp2 EOF ) + // InternalSyntacticSequencerTestLanguage.g:785:2: iv_ruleExp2= ruleExp2 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getExp2Rule()); @@ -2048,7 +2097,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleExp2" - // InternalSyntacticSequencerTestLanguage.g:771:1: ruleExp2 returns [EObject current=null] : (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) ; + // InternalSyntacticSequencerTestLanguage.g:791:1: ruleExp2 returns [EObject current=null] : (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) ; public final EObject ruleExp2() throws RecognitionException { EObject current = null; @@ -2060,13 +2109,13 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:777:2: ( (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) ) - // InternalSyntacticSequencerTestLanguage.g:778:2: (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) + // InternalSyntacticSequencerTestLanguage.g:797:2: ( (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) ) + // InternalSyntacticSequencerTestLanguage.g:798:2: (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) { - // InternalSyntacticSequencerTestLanguage.g:778:2: (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) - // InternalSyntacticSequencerTestLanguage.g:779:3: otherlv_0= '#4' this_Addition2_1= ruleAddition2 + // InternalSyntacticSequencerTestLanguage.g:798:2: (otherlv_0= '#4' this_Addition2_1= ruleAddition2 ) + // InternalSyntacticSequencerTestLanguage.g:799:3: otherlv_0= '#4' this_Addition2_1= ruleAddition2 { - otherlv_0=(Token)match(input,23,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_0=(Token)match(input,24,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getExp2Access().getNumberSignDigitFourKeyword_0()); @@ -2113,7 +2162,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleAddition2" - // InternalSyntacticSequencerTestLanguage.g:795:1: entryRuleAddition2 returns [EObject current=null] : iv_ruleAddition2= ruleAddition2 EOF ; + // InternalSyntacticSequencerTestLanguage.g:815:1: entryRuleAddition2 returns [EObject current=null] : iv_ruleAddition2= ruleAddition2 EOF ; public final EObject entryRuleAddition2() throws RecognitionException { EObject current = null; @@ -2121,8 +2170,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:795:50: (iv_ruleAddition2= ruleAddition2 EOF ) - // InternalSyntacticSequencerTestLanguage.g:796:2: iv_ruleAddition2= ruleAddition2 EOF + // InternalSyntacticSequencerTestLanguage.g:815:50: (iv_ruleAddition2= ruleAddition2 EOF ) + // InternalSyntacticSequencerTestLanguage.g:816:2: iv_ruleAddition2= ruleAddition2 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getAddition2Rule()); @@ -2153,7 +2202,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleAddition2" - // InternalSyntacticSequencerTestLanguage.g:802:1: ruleAddition2 returns [EObject current=null] : (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) ; + // InternalSyntacticSequencerTestLanguage.g:822:1: ruleAddition2 returns [EObject current=null] : (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) ; public final EObject ruleAddition2() throws RecognitionException { EObject current = null; @@ -2167,11 +2216,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:808:2: ( (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) ) - // InternalSyntacticSequencerTestLanguage.g:809:2: (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:828:2: ( (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) ) + // InternalSyntacticSequencerTestLanguage.g:829:2: (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) { - // InternalSyntacticSequencerTestLanguage.g:809:2: (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) - // InternalSyntacticSequencerTestLanguage.g:810:3: this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:829:2: (this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:830:3: this_Multiplication2_0= ruleMultiplication2 ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* { if ( state.backtracking==0 ) { @@ -2189,23 +2238,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - // InternalSyntacticSequencerTestLanguage.g:818:3: ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:838:3: ( () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) )* loop5: do { int alt5=2; int LA5_0 = input.LA(1); - if ( (LA5_0==19) ) { + if ( (LA5_0==20) ) { alt5=1; } switch (alt5) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:819:4: () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) + // InternalSyntacticSequencerTestLanguage.g:839:4: () otherlv_2= '+' ( (lv_right_3_0= ruleMultiplication2 ) ) { - // InternalSyntacticSequencerTestLanguage.g:819:4: () - // InternalSyntacticSequencerTestLanguage.g:820:5: + // InternalSyntacticSequencerTestLanguage.g:839:4: () + // InternalSyntacticSequencerTestLanguage.g:840:5: { if ( state.backtracking==0 ) { @@ -2217,17 +2266,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_2=(Token)match(input,19,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_2=(Token)match(input,20,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getAddition2Access().getPlusSignKeyword_1_1()); } - // InternalSyntacticSequencerTestLanguage.g:830:4: ( (lv_right_3_0= ruleMultiplication2 ) ) - // InternalSyntacticSequencerTestLanguage.g:831:5: (lv_right_3_0= ruleMultiplication2 ) + // InternalSyntacticSequencerTestLanguage.g:850:4: ( (lv_right_3_0= ruleMultiplication2 ) ) + // InternalSyntacticSequencerTestLanguage.g:851:5: (lv_right_3_0= ruleMultiplication2 ) { - // InternalSyntacticSequencerTestLanguage.g:831:5: (lv_right_3_0= ruleMultiplication2 ) - // InternalSyntacticSequencerTestLanguage.g:832:6: lv_right_3_0= ruleMultiplication2 + // InternalSyntacticSequencerTestLanguage.g:851:5: (lv_right_3_0= ruleMultiplication2 ) + // InternalSyntacticSequencerTestLanguage.g:852:6: lv_right_3_0= ruleMultiplication2 { if ( state.backtracking==0 ) { @@ -2292,7 +2341,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleMultiplication2" - // InternalSyntacticSequencerTestLanguage.g:854:1: entryRuleMultiplication2 returns [EObject current=null] : iv_ruleMultiplication2= ruleMultiplication2 EOF ; + // InternalSyntacticSequencerTestLanguage.g:874:1: entryRuleMultiplication2 returns [EObject current=null] : iv_ruleMultiplication2= ruleMultiplication2 EOF ; public final EObject entryRuleMultiplication2() throws RecognitionException { EObject current = null; @@ -2300,8 +2349,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:854:56: (iv_ruleMultiplication2= ruleMultiplication2 EOF ) - // InternalSyntacticSequencerTestLanguage.g:855:2: iv_ruleMultiplication2= ruleMultiplication2 EOF + // InternalSyntacticSequencerTestLanguage.g:874:56: (iv_ruleMultiplication2= ruleMultiplication2 EOF ) + // InternalSyntacticSequencerTestLanguage.g:875:2: iv_ruleMultiplication2= ruleMultiplication2 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getMultiplication2Rule()); @@ -2332,7 +2381,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleMultiplication2" - // InternalSyntacticSequencerTestLanguage.g:861:1: ruleMultiplication2 returns [EObject current=null] : (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) ; + // InternalSyntacticSequencerTestLanguage.g:881:1: ruleMultiplication2 returns [EObject current=null] : (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) ; public final EObject ruleMultiplication2() throws RecognitionException { EObject current = null; @@ -2346,11 +2395,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:867:2: ( (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) ) - // InternalSyntacticSequencerTestLanguage.g:868:2: (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:887:2: ( (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) ) + // InternalSyntacticSequencerTestLanguage.g:888:2: (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) { - // InternalSyntacticSequencerTestLanguage.g:868:2: (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) - // InternalSyntacticSequencerTestLanguage.g:869:3: this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:888:2: (this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* ) + // InternalSyntacticSequencerTestLanguage.g:889:3: this_Prim2_0= rulePrim2 ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* { if ( state.backtracking==0 ) { @@ -2368,23 +2417,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - // InternalSyntacticSequencerTestLanguage.g:877:3: ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* + // InternalSyntacticSequencerTestLanguage.g:897:3: ( () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) )* loop6: do { int alt6=2; int LA6_0 = input.LA(1); - if ( (LA6_0==24) ) { + if ( (LA6_0==25) ) { alt6=1; } switch (alt6) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:878:4: () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) + // InternalSyntacticSequencerTestLanguage.g:898:4: () otherlv_2= '*' ( (lv_right_3_0= rulePrim2 ) ) { - // InternalSyntacticSequencerTestLanguage.g:878:4: () - // InternalSyntacticSequencerTestLanguage.g:879:5: + // InternalSyntacticSequencerTestLanguage.g:898:4: () + // InternalSyntacticSequencerTestLanguage.g:899:5: { if ( state.backtracking==0 ) { @@ -2396,17 +2445,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_2=(Token)match(input,24,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_2=(Token)match(input,25,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getMultiplication2Access().getAsteriskKeyword_1_1()); } - // InternalSyntacticSequencerTestLanguage.g:889:4: ( (lv_right_3_0= rulePrim2 ) ) - // InternalSyntacticSequencerTestLanguage.g:890:5: (lv_right_3_0= rulePrim2 ) + // InternalSyntacticSequencerTestLanguage.g:909:4: ( (lv_right_3_0= rulePrim2 ) ) + // InternalSyntacticSequencerTestLanguage.g:910:5: (lv_right_3_0= rulePrim2 ) { - // InternalSyntacticSequencerTestLanguage.g:890:5: (lv_right_3_0= rulePrim2 ) - // InternalSyntacticSequencerTestLanguage.g:891:6: lv_right_3_0= rulePrim2 + // InternalSyntacticSequencerTestLanguage.g:910:5: (lv_right_3_0= rulePrim2 ) + // InternalSyntacticSequencerTestLanguage.g:911:6: lv_right_3_0= rulePrim2 { if ( state.backtracking==0 ) { @@ -2471,7 +2520,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRulePrim2" - // InternalSyntacticSequencerTestLanguage.g:913:1: entryRulePrim2 returns [EObject current=null] : iv_rulePrim2= rulePrim2 EOF ; + // InternalSyntacticSequencerTestLanguage.g:933:1: entryRulePrim2 returns [EObject current=null] : iv_rulePrim2= rulePrim2 EOF ; public final EObject entryRulePrim2() throws RecognitionException { EObject current = null; @@ -2479,8 +2528,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:913:46: (iv_rulePrim2= rulePrim2 EOF ) - // InternalSyntacticSequencerTestLanguage.g:914:2: iv_rulePrim2= rulePrim2 EOF + // InternalSyntacticSequencerTestLanguage.g:933:46: (iv_rulePrim2= rulePrim2 EOF ) + // InternalSyntacticSequencerTestLanguage.g:934:2: iv_rulePrim2= rulePrim2 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPrim2Rule()); @@ -2511,7 +2560,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "rulePrim2" - // InternalSyntacticSequencerTestLanguage.g:920:1: rulePrim2 returns [EObject current=null] : ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) ; + // InternalSyntacticSequencerTestLanguage.g:940:1: rulePrim2 returns [EObject current=null] : ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) ; public final EObject rulePrim2() throws RecognitionException { EObject current = null; @@ -2525,17 +2574,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:926:2: ( ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) ) - // InternalSyntacticSequencerTestLanguage.g:927:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) + // InternalSyntacticSequencerTestLanguage.g:946:2: ( ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) ) + // InternalSyntacticSequencerTestLanguage.g:947:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) { - // InternalSyntacticSequencerTestLanguage.g:927:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) + // InternalSyntacticSequencerTestLanguage.g:947:2: ( ( () ( (lv_name_1_0= RULE_ID ) ) ) | (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) ) int alt7=2; int LA7_0 = input.LA(1); if ( (LA7_0==RULE_ID) ) { alt7=1; } - else if ( (LA7_0==21) ) { + else if ( (LA7_0==22) ) { alt7=2; } else { @@ -2547,13 +2596,13 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt7) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:928:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:948:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:928:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:929:4: () ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:948:3: ( () ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:949:4: () ( (lv_name_1_0= RULE_ID ) ) { - // InternalSyntacticSequencerTestLanguage.g:929:4: () - // InternalSyntacticSequencerTestLanguage.g:930:5: + // InternalSyntacticSequencerTestLanguage.g:949:4: () + // InternalSyntacticSequencerTestLanguage.g:950:5: { if ( state.backtracking==0 ) { @@ -2565,11 +2614,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:936:4: ( (lv_name_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:937:5: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:956:4: ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:957:5: (lv_name_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:937:5: (lv_name_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:938:6: lv_name_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:957:5: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:958:6: lv_name_1_0= RULE_ID { lv_name_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -2602,12 +2651,12 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:956:3: (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) + // InternalSyntacticSequencerTestLanguage.g:976:3: (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) { - // InternalSyntacticSequencerTestLanguage.g:956:3: (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) - // InternalSyntacticSequencerTestLanguage.g:957:4: otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' + // InternalSyntacticSequencerTestLanguage.g:976:3: (otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' ) + // InternalSyntacticSequencerTestLanguage.g:977:4: otherlv_2= '(' this_Addition2_3= ruleAddition2 otherlv_4= ')' { - otherlv_2=(Token)match(input,21,FollowSets000.FOLLOW_9); if (state.failed) return current; + otherlv_2=(Token)match(input,22,FollowSets000.FOLLOW_9); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getPrim2Access().getLeftParenthesisKeyword_1_0()); @@ -2629,7 +2678,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - otherlv_4=(Token)match(input,22,FollowSets000.FOLLOW_2); if (state.failed) return current; + otherlv_4=(Token)match(input,23,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getPrim2Access().getRightParenthesisKeyword_1_2()); @@ -2666,7 +2715,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleDatatypeID" - // InternalSyntacticSequencerTestLanguage.g:978:1: entryRuleDatatypeID returns [String current=null] : iv_ruleDatatypeID= ruleDatatypeID EOF ; + // InternalSyntacticSequencerTestLanguage.g:998:1: entryRuleDatatypeID returns [String current=null] : iv_ruleDatatypeID= ruleDatatypeID EOF ; public final String entryRuleDatatypeID() throws RecognitionException { String current = null; @@ -2674,8 +2723,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:978:50: (iv_ruleDatatypeID= ruleDatatypeID EOF ) - // InternalSyntacticSequencerTestLanguage.g:979:2: iv_ruleDatatypeID= ruleDatatypeID EOF + // InternalSyntacticSequencerTestLanguage.g:998:50: (iv_ruleDatatypeID= ruleDatatypeID EOF ) + // InternalSyntacticSequencerTestLanguage.g:999:2: iv_ruleDatatypeID= ruleDatatypeID EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getDatatypeIDRule()); @@ -2706,7 +2755,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleDatatypeID" - // InternalSyntacticSequencerTestLanguage.g:985:1: ruleDatatypeID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ; + // InternalSyntacticSequencerTestLanguage.g:1005:1: ruleDatatypeID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ; public final AntlrDatatypeRuleToken ruleDatatypeID() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -2716,8 +2765,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:991:2: (this_ID_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:992:2: this_ID_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1011:2: (this_ID_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1012:2: this_ID_0= RULE_ID { this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -2752,7 +2801,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleSingleCrossReference" - // InternalSyntacticSequencerTestLanguage.g:1002:1: entryRuleSingleCrossReference returns [EObject current=null] : iv_ruleSingleCrossReference= ruleSingleCrossReference EOF ; + // InternalSyntacticSequencerTestLanguage.g:1022:1: entryRuleSingleCrossReference returns [EObject current=null] : iv_ruleSingleCrossReference= ruleSingleCrossReference EOF ; public final EObject entryRuleSingleCrossReference() throws RecognitionException { EObject current = null; @@ -2760,8 +2809,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1002:61: (iv_ruleSingleCrossReference= ruleSingleCrossReference EOF ) - // InternalSyntacticSequencerTestLanguage.g:1003:2: iv_ruleSingleCrossReference= ruleSingleCrossReference EOF + // InternalSyntacticSequencerTestLanguage.g:1022:61: (iv_ruleSingleCrossReference= ruleSingleCrossReference EOF ) + // InternalSyntacticSequencerTestLanguage.g:1023:2: iv_ruleSingleCrossReference= ruleSingleCrossReference EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getSingleCrossReferenceRule()); @@ -2792,7 +2841,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleSingleCrossReference" - // InternalSyntacticSequencerTestLanguage.g:1009:1: ruleSingleCrossReference returns [EObject current=null] : (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) ; + // InternalSyntacticSequencerTestLanguage.g:1029:1: ruleSingleCrossReference returns [EObject current=null] : (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) ; public final EObject ruleSingleCrossReference() throws RecognitionException { EObject current = null; @@ -2811,25 +2860,25 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1015:2: ( (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) ) - // InternalSyntacticSequencerTestLanguage.g:1016:2: (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1035:2: ( (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) ) + // InternalSyntacticSequencerTestLanguage.g:1036:2: (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1016:2: (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1017:3: otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? + // InternalSyntacticSequencerTestLanguage.g:1036:2: (otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1037:3: otherlv_0= '#5' ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? { - otherlv_0=(Token)match(input,25,FollowSets000.FOLLOW_12); if (state.failed) return current; + otherlv_0=(Token)match(input,26,FollowSets000.FOLLOW_12); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getSingleCrossReferenceAccess().getNumberSignDigitFiveKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1021:3: ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1022:4: ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1041:3: ( ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1042:4: ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) { - // InternalSyntacticSequencerTestLanguage.g:1022:4: ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1023:5: (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1042:4: ( (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1043:5: (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1023:5: (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1043:5: (lv_name_1_1= RULE_TERMINAL_ID | lv_name_1_2= RULE_ID ) int alt8=2; int LA8_0 = input.LA(1); @@ -2848,7 +2897,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt8) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1024:6: lv_name_1_1= RULE_TERMINAL_ID + // InternalSyntacticSequencerTestLanguage.g:1044:6: lv_name_1_1= RULE_TERMINAL_ID { lv_name_1_1=(Token)match(input,RULE_TERMINAL_ID,FollowSets000.FOLLOW_13); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -2872,7 +2921,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:1039:6: lv_name_1_2= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1059:6: lv_name_1_2= RULE_ID { lv_name_1_2=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_13); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -2904,28 +2953,28 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1056:3: (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? + // InternalSyntacticSequencerTestLanguage.g:1076:3: (otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) )? int alt9=2; int LA9_0 = input.LA(1); - if ( (LA9_0==14) ) { + if ( (LA9_0==15) ) { alt9=1; } switch (alt9) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1057:4: otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1077:4: otherlv_2= 'kw1' ( (otherlv_3= RULE_TERMINAL_ID ) ) { - otherlv_2=(Token)match(input,14,FollowSets000.FOLLOW_14); if (state.failed) return current; + otherlv_2=(Token)match(input,15,FollowSets000.FOLLOW_14); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getSingleCrossReferenceAccess().getKw1Keyword_2_0()); } - // InternalSyntacticSequencerTestLanguage.g:1061:4: ( (otherlv_3= RULE_TERMINAL_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1062:5: (otherlv_3= RULE_TERMINAL_ID ) + // InternalSyntacticSequencerTestLanguage.g:1081:4: ( (otherlv_3= RULE_TERMINAL_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1082:5: (otherlv_3= RULE_TERMINAL_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1062:5: (otherlv_3= RULE_TERMINAL_ID ) - // InternalSyntacticSequencerTestLanguage.g:1063:6: otherlv_3= RULE_TERMINAL_ID + // InternalSyntacticSequencerTestLanguage.g:1082:5: (otherlv_3= RULE_TERMINAL_ID ) + // InternalSyntacticSequencerTestLanguage.g:1083:6: otherlv_3= RULE_TERMINAL_ID { if ( state.backtracking==0 ) { @@ -2952,28 +3001,28 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1075:3: (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? + // InternalSyntacticSequencerTestLanguage.g:1095:3: (otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) )? int alt10=2; int LA10_0 = input.LA(1); - if ( (LA10_0==15) ) { + if ( (LA10_0==16) ) { alt10=1; } switch (alt10) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1076:4: otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) + // InternalSyntacticSequencerTestLanguage.g:1096:4: otherlv_4= 'kw2' ( ( ruleDatatypeID ) ) { - otherlv_4=(Token)match(input,15,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_4=(Token)match(input,16,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getSingleCrossReferenceAccess().getKw2Keyword_3_0()); } - // InternalSyntacticSequencerTestLanguage.g:1080:4: ( ( ruleDatatypeID ) ) - // InternalSyntacticSequencerTestLanguage.g:1081:5: ( ruleDatatypeID ) + // InternalSyntacticSequencerTestLanguage.g:1100:4: ( ( ruleDatatypeID ) ) + // InternalSyntacticSequencerTestLanguage.g:1101:5: ( ruleDatatypeID ) { - // InternalSyntacticSequencerTestLanguage.g:1081:5: ( ruleDatatypeID ) - // InternalSyntacticSequencerTestLanguage.g:1082:6: ruleDatatypeID + // InternalSyntacticSequencerTestLanguage.g:1101:5: ( ruleDatatypeID ) + // InternalSyntacticSequencerTestLanguage.g:1102:6: ruleDatatypeID { if ( state.backtracking==0 ) { @@ -3009,28 +3058,28 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1097:3: (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? + // InternalSyntacticSequencerTestLanguage.g:1117:3: (otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) )? int alt11=2; int LA11_0 = input.LA(1); - if ( (LA11_0==16) ) { + if ( (LA11_0==17) ) { alt11=1; } switch (alt11) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1098:4: otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1118:4: otherlv_6= 'kw3' ( (otherlv_7= RULE_ID ) ) { - otherlv_6=(Token)match(input,16,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_6=(Token)match(input,17,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getSingleCrossReferenceAccess().getKw3Keyword_4_0()); } - // InternalSyntacticSequencerTestLanguage.g:1102:4: ( (otherlv_7= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1103:5: (otherlv_7= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1122:4: ( (otherlv_7= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1123:5: (otherlv_7= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1103:5: (otherlv_7= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1104:6: otherlv_7= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1123:5: (otherlv_7= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1124:6: otherlv_7= RULE_ID { if ( state.backtracking==0 ) { @@ -3057,28 +3106,28 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1116:3: (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? + // InternalSyntacticSequencerTestLanguage.g:1136:3: (otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) )? int alt12=2; int LA12_0 = input.LA(1); - if ( (LA12_0==17) ) { + if ( (LA12_0==18) ) { alt12=1; } switch (alt12) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1117:4: otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1137:4: otherlv_8= 'kw4' ( (otherlv_9= RULE_ID ) ) { - otherlv_8=(Token)match(input,17,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_8=(Token)match(input,18,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getSingleCrossReferenceAccess().getKw4Keyword_5_0()); } - // InternalSyntacticSequencerTestLanguage.g:1121:4: ( (otherlv_9= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1122:5: (otherlv_9= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1141:4: ( (otherlv_9= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1142:5: (otherlv_9= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1122:5: (otherlv_9= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1123:6: otherlv_9= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1142:5: (otherlv_9= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1143:6: otherlv_9= RULE_ID { if ( state.backtracking==0 ) { @@ -3130,7 +3179,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleBooleanAlternative" - // InternalSyntacticSequencerTestLanguage.g:1139:1: entryRuleBooleanAlternative returns [EObject current=null] : iv_ruleBooleanAlternative= ruleBooleanAlternative EOF ; + // InternalSyntacticSequencerTestLanguage.g:1159:1: entryRuleBooleanAlternative returns [EObject current=null] : iv_ruleBooleanAlternative= ruleBooleanAlternative EOF ; public final EObject entryRuleBooleanAlternative() throws RecognitionException { EObject current = null; @@ -3138,8 +3187,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1139:59: (iv_ruleBooleanAlternative= ruleBooleanAlternative EOF ) - // InternalSyntacticSequencerTestLanguage.g:1140:2: iv_ruleBooleanAlternative= ruleBooleanAlternative EOF + // InternalSyntacticSequencerTestLanguage.g:1159:59: (iv_ruleBooleanAlternative= ruleBooleanAlternative EOF ) + // InternalSyntacticSequencerTestLanguage.g:1160:2: iv_ruleBooleanAlternative= ruleBooleanAlternative EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getBooleanAlternativeRule()); @@ -3170,7 +3219,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleBooleanAlternative" - // InternalSyntacticSequencerTestLanguage.g:1146:1: ruleBooleanAlternative returns [EObject current=null] : (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1166:1: ruleBooleanAlternative returns [EObject current=null] : (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) ; public final EObject ruleBooleanAlternative() throws RecognitionException { EObject current = null; @@ -3182,23 +3231,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1152:2: ( (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1153:2: (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1172:2: ( (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1173:2: (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1153:2: (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1154:3: otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) + // InternalSyntacticSequencerTestLanguage.g:1173:2: (otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1174:3: otherlv_0= '#6' ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) { - otherlv_0=(Token)match(input,26,FollowSets000.FOLLOW_18); if (state.failed) return current; + otherlv_0=(Token)match(input,27,FollowSets000.FOLLOW_18); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getBooleanAlternativeAccess().getNumberSignDigitSixKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1158:3: ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) - // InternalSyntacticSequencerTestLanguage.g:1159:4: (lv_bool_1_0= ruleBooleanAlternativeLiteral ) + // InternalSyntacticSequencerTestLanguage.g:1178:3: ( (lv_bool_1_0= ruleBooleanAlternativeLiteral ) ) + // InternalSyntacticSequencerTestLanguage.g:1179:4: (lv_bool_1_0= ruleBooleanAlternativeLiteral ) { - // InternalSyntacticSequencerTestLanguage.g:1159:4: (lv_bool_1_0= ruleBooleanAlternativeLiteral ) - // InternalSyntacticSequencerTestLanguage.g:1160:5: lv_bool_1_0= ruleBooleanAlternativeLiteral + // InternalSyntacticSequencerTestLanguage.g:1179:4: (lv_bool_1_0= ruleBooleanAlternativeLiteral ) + // InternalSyntacticSequencerTestLanguage.g:1180:5: lv_bool_1_0= ruleBooleanAlternativeLiteral { if ( state.backtracking==0 ) { @@ -3254,7 +3303,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleBooleanAlternativeLiteral" - // InternalSyntacticSequencerTestLanguage.g:1181:1: entryRuleBooleanAlternativeLiteral returns [EObject current=null] : iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF ; + // InternalSyntacticSequencerTestLanguage.g:1201:1: entryRuleBooleanAlternativeLiteral returns [EObject current=null] : iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF ; public final EObject entryRuleBooleanAlternativeLiteral() throws RecognitionException { EObject current = null; @@ -3262,8 +3311,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1181:66: (iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF ) - // InternalSyntacticSequencerTestLanguage.g:1182:2: iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF + // InternalSyntacticSequencerTestLanguage.g:1201:66: (iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF ) + // InternalSyntacticSequencerTestLanguage.g:1202:2: iv_ruleBooleanAlternativeLiteral= ruleBooleanAlternativeLiteral EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getBooleanAlternativeLiteralRule()); @@ -3294,7 +3343,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleBooleanAlternativeLiteral" - // InternalSyntacticSequencerTestLanguage.g:1188:1: ruleBooleanAlternativeLiteral returns [EObject current=null] : ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1208:1: ruleBooleanAlternativeLiteral returns [EObject current=null] : ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) ; public final EObject ruleBooleanAlternativeLiteral() throws RecognitionException { EObject current = null; @@ -3305,14 +3354,14 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1194:2: ( ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1195:2: ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1214:2: ( ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1215:2: ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1195:2: ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1196:3: () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1215:2: ( () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1216:3: () (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1196:3: () - // InternalSyntacticSequencerTestLanguage.g:1197:4: + // InternalSyntacticSequencerTestLanguage.g:1216:3: () + // InternalSyntacticSequencerTestLanguage.g:1217:4: { if ( state.backtracking==0 ) { @@ -3324,14 +3373,14 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1203:3: (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1223:3: (otherlv_1= 'kw1' | ( (lv_isTrue_2_0= 'kw2' ) ) ) int alt13=2; int LA13_0 = input.LA(1); - if ( (LA13_0==14) ) { + if ( (LA13_0==15) ) { alt13=1; } - else if ( (LA13_0==15) ) { + else if ( (LA13_0==16) ) { alt13=2; } else { @@ -3343,9 +3392,9 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt13) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1204:4: otherlv_1= 'kw1' + // InternalSyntacticSequencerTestLanguage.g:1224:4: otherlv_1= 'kw1' { - otherlv_1=(Token)match(input,14,FollowSets000.FOLLOW_2); if (state.failed) return current; + otherlv_1=(Token)match(input,15,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getBooleanAlternativeLiteralAccess().getKw1Keyword_1_0()); @@ -3355,15 +3404,15 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:1209:4: ( (lv_isTrue_2_0= 'kw2' ) ) + // InternalSyntacticSequencerTestLanguage.g:1229:4: ( (lv_isTrue_2_0= 'kw2' ) ) { - // InternalSyntacticSequencerTestLanguage.g:1209:4: ( (lv_isTrue_2_0= 'kw2' ) ) - // InternalSyntacticSequencerTestLanguage.g:1210:5: (lv_isTrue_2_0= 'kw2' ) + // InternalSyntacticSequencerTestLanguage.g:1229:4: ( (lv_isTrue_2_0= 'kw2' ) ) + // InternalSyntacticSequencerTestLanguage.g:1230:5: (lv_isTrue_2_0= 'kw2' ) { - // InternalSyntacticSequencerTestLanguage.g:1210:5: (lv_isTrue_2_0= 'kw2' ) - // InternalSyntacticSequencerTestLanguage.g:1211:6: lv_isTrue_2_0= 'kw2' + // InternalSyntacticSequencerTestLanguage.g:1230:5: (lv_isTrue_2_0= 'kw2' ) + // InternalSyntacticSequencerTestLanguage.g:1231:6: lv_isTrue_2_0= 'kw2' { - lv_isTrue_2_0=(Token)match(input,15,FollowSets000.FOLLOW_2); if (state.failed) return current; + lv_isTrue_2_0=(Token)match(input,16,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_isTrue_2_0, grammarAccess.getBooleanAlternativeLiteralAccess().getIsTrueKw2Keyword_1_1_0()); @@ -3414,7 +3463,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleUnassignedDatatype" - // InternalSyntacticSequencerTestLanguage.g:1228:1: entryRuleUnassignedDatatype returns [EObject current=null] : iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF ; + // InternalSyntacticSequencerTestLanguage.g:1248:1: entryRuleUnassignedDatatype returns [EObject current=null] : iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF ; public final EObject entryRuleUnassignedDatatype() throws RecognitionException { EObject current = null; @@ -3422,8 +3471,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1228:59: (iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF ) - // InternalSyntacticSequencerTestLanguage.g:1229:2: iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF + // InternalSyntacticSequencerTestLanguage.g:1248:59: (iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF ) + // InternalSyntacticSequencerTestLanguage.g:1249:2: iv_ruleUnassignedDatatype= ruleUnassignedDatatype EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getUnassignedDatatypeRule()); @@ -3454,7 +3503,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleUnassignedDatatype" - // InternalSyntacticSequencerTestLanguage.g:1235:1: ruleUnassignedDatatype returns [EObject current=null] : (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) ; + // InternalSyntacticSequencerTestLanguage.g:1255:1: ruleUnassignedDatatype returns [EObject current=null] : (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) ; public final EObject ruleUnassignedDatatype() throws RecognitionException { EObject current = null; @@ -3465,23 +3514,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1241:2: ( (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) ) - // InternalSyntacticSequencerTestLanguage.g:1242:2: (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) + // InternalSyntacticSequencerTestLanguage.g:1261:2: ( (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) ) + // InternalSyntacticSequencerTestLanguage.g:1262:2: (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) { - // InternalSyntacticSequencerTestLanguage.g:1242:2: (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) - // InternalSyntacticSequencerTestLanguage.g:1243:3: otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 + // InternalSyntacticSequencerTestLanguage.g:1262:2: (otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 ) + // InternalSyntacticSequencerTestLanguage.g:1263:3: otherlv_0= '#7' ( (lv_val_1_0= RULE_ID ) ) ruleKW1 { - otherlv_0=(Token)match(input,27,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_0=(Token)match(input,28,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getUnassignedDatatypeAccess().getNumberSignDigitSevenKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1247:3: ( (lv_val_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1248:4: (lv_val_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1267:3: ( (lv_val_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1268:4: (lv_val_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1248:4: (lv_val_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1249:5: lv_val_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1268:4: (lv_val_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1269:5: lv_val_1_0= RULE_ID { lv_val_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_19); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -3547,7 +3596,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleKW1" - // InternalSyntacticSequencerTestLanguage.g:1276:1: entryRuleKW1 returns [String current=null] : iv_ruleKW1= ruleKW1 EOF ; + // InternalSyntacticSequencerTestLanguage.g:1296:1: entryRuleKW1 returns [String current=null] : iv_ruleKW1= ruleKW1 EOF ; public final String entryRuleKW1() throws RecognitionException { String current = null; @@ -3555,8 +3604,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1276:43: (iv_ruleKW1= ruleKW1 EOF ) - // InternalSyntacticSequencerTestLanguage.g:1277:2: iv_ruleKW1= ruleKW1 EOF + // InternalSyntacticSequencerTestLanguage.g:1296:43: (iv_ruleKW1= ruleKW1 EOF ) + // InternalSyntacticSequencerTestLanguage.g:1297:2: iv_ruleKW1= ruleKW1 EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getKW1Rule()); @@ -3587,7 +3636,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleKW1" - // InternalSyntacticSequencerTestLanguage.g:1283:1: ruleKW1 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1303:1: ruleKW1 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) ; public final AntlrDatatypeRuleToken ruleKW1() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -3598,17 +3647,17 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1289:2: ( (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1290:2: (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) + // InternalSyntacticSequencerTestLanguage.g:1309:2: ( (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1310:2: (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) { - // InternalSyntacticSequencerTestLanguage.g:1290:2: (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) + // InternalSyntacticSequencerTestLanguage.g:1310:2: (kw= 'kw1' | (kw= 'matched' (this_INT_2= RULE_INT )? ) ) int alt15=2; int LA15_0 = input.LA(1); - if ( (LA15_0==14) ) { + if ( (LA15_0==15) ) { alt15=1; } - else if ( (LA15_0==28) ) { + else if ( (LA15_0==29) ) { alt15=2; } else { @@ -3620,9 +3669,9 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt15) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1291:3: kw= 'kw1' + // InternalSyntacticSequencerTestLanguage.g:1311:3: kw= 'kw1' { - kw=(Token)match(input,14,FollowSets000.FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,15,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -3633,19 +3682,19 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:1297:3: (kw= 'matched' (this_INT_2= RULE_INT )? ) + // InternalSyntacticSequencerTestLanguage.g:1317:3: (kw= 'matched' (this_INT_2= RULE_INT )? ) { - // InternalSyntacticSequencerTestLanguage.g:1297:3: (kw= 'matched' (this_INT_2= RULE_INT )? ) - // InternalSyntacticSequencerTestLanguage.g:1298:4: kw= 'matched' (this_INT_2= RULE_INT )? + // InternalSyntacticSequencerTestLanguage.g:1317:3: (kw= 'matched' (this_INT_2= RULE_INT )? ) + // InternalSyntacticSequencerTestLanguage.g:1318:4: kw= 'matched' (this_INT_2= RULE_INT )? { - kw=(Token)match(input,28,FollowSets000.FOLLOW_20); if (state.failed) return current; + kw=(Token)match(input,29,FollowSets000.FOLLOW_20); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getKW1Access().getMatchedKeyword_1_0()); } - // InternalSyntacticSequencerTestLanguage.g:1303:4: (this_INT_2= RULE_INT )? + // InternalSyntacticSequencerTestLanguage.g:1323:4: (this_INT_2= RULE_INT )? int alt14=2; int LA14_0 = input.LA(1); @@ -3654,7 +3703,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt14) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1304:5: this_INT_2= RULE_INT + // InternalSyntacticSequencerTestLanguage.g:1324:5: this_INT_2= RULE_INT { this_INT_2=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -3704,7 +3753,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleOptionalSingleTransition" - // InternalSyntacticSequencerTestLanguage.g:1317:1: entryRuleOptionalSingleTransition returns [EObject current=null] : iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF ; + // InternalSyntacticSequencerTestLanguage.g:1337:1: entryRuleOptionalSingleTransition returns [EObject current=null] : iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF ; public final EObject entryRuleOptionalSingleTransition() throws RecognitionException { EObject current = null; @@ -3712,8 +3761,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1317:65: (iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF ) - // InternalSyntacticSequencerTestLanguage.g:1318:2: iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF + // InternalSyntacticSequencerTestLanguage.g:1337:65: (iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF ) + // InternalSyntacticSequencerTestLanguage.g:1338:2: iv_ruleOptionalSingleTransition= ruleOptionalSingleTransition EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getOptionalSingleTransitionRule()); @@ -3744,7 +3793,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleOptionalSingleTransition" - // InternalSyntacticSequencerTestLanguage.g:1324:1: ruleOptionalSingleTransition returns [EObject current=null] : (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1344:1: ruleOptionalSingleTransition returns [EObject current=null] : (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) ; public final EObject ruleOptionalSingleTransition() throws RecognitionException { EObject current = null; @@ -3755,28 +3804,28 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1330:2: ( (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1331:2: (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1350:2: ( (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1351:2: (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1331:2: (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1332:3: otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1351:2: (otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1352:3: otherlv_0= '#8' ( ruleKW1 )? ( (lv_val_2_0= RULE_ID ) ) { - otherlv_0=(Token)match(input,29,FollowSets000.FOLLOW_21); if (state.failed) return current; + otherlv_0=(Token)match(input,30,FollowSets000.FOLLOW_21); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getOptionalSingleTransitionAccess().getNumberSignDigitEightKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1336:3: ( ruleKW1 )? + // InternalSyntacticSequencerTestLanguage.g:1356:3: ( ruleKW1 )? int alt16=2; int LA16_0 = input.LA(1); - if ( (LA16_0==14||LA16_0==28) ) { + if ( (LA16_0==15||LA16_0==29) ) { alt16=1; } switch (alt16) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1337:4: ruleKW1 + // InternalSyntacticSequencerTestLanguage.g:1357:4: ruleKW1 { if ( state.backtracking==0 ) { @@ -3799,11 +3848,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1345:3: ( (lv_val_2_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1346:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1365:3: ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1366:4: (lv_val_2_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1346:4: (lv_val_2_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1347:5: lv_val_2_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1366:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1367:5: lv_val_2_0= RULE_ID { lv_val_2_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -3854,7 +3903,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleOptionalManyTransition" - // InternalSyntacticSequencerTestLanguage.g:1367:1: entryRuleOptionalManyTransition returns [EObject current=null] : iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF ; + // InternalSyntacticSequencerTestLanguage.g:1387:1: entryRuleOptionalManyTransition returns [EObject current=null] : iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF ; public final EObject entryRuleOptionalManyTransition() throws RecognitionException { EObject current = null; @@ -3862,8 +3911,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1367:63: (iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF ) - // InternalSyntacticSequencerTestLanguage.g:1368:2: iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF + // InternalSyntacticSequencerTestLanguage.g:1387:63: (iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF ) + // InternalSyntacticSequencerTestLanguage.g:1388:2: iv_ruleOptionalManyTransition= ruleOptionalManyTransition EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getOptionalManyTransitionRule()); @@ -3894,7 +3943,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleOptionalManyTransition" - // InternalSyntacticSequencerTestLanguage.g:1374:1: ruleOptionalManyTransition returns [EObject current=null] : (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1394:1: ruleOptionalManyTransition returns [EObject current=null] : (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) ; public final EObject ruleOptionalManyTransition() throws RecognitionException { EObject current = null; @@ -3905,32 +3954,32 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1380:2: ( (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1381:2: (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1400:2: ( (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1401:2: (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1381:2: (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1382:3: otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1401:2: (otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1402:3: otherlv_0= '#9' ( ruleKW1 )* ( (lv_val_2_0= RULE_ID ) ) { - otherlv_0=(Token)match(input,30,FollowSets000.FOLLOW_21); if (state.failed) return current; + otherlv_0=(Token)match(input,31,FollowSets000.FOLLOW_21); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getOptionalManyTransitionAccess().getNumberSignDigitNineKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1386:3: ( ruleKW1 )* + // InternalSyntacticSequencerTestLanguage.g:1406:3: ( ruleKW1 )* loop17: do { int alt17=2; int LA17_0 = input.LA(1); - if ( (LA17_0==14||LA17_0==28) ) { + if ( (LA17_0==15||LA17_0==29) ) { alt17=1; } switch (alt17) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1387:4: ruleKW1 + // InternalSyntacticSequencerTestLanguage.g:1407:4: ruleKW1 { if ( state.backtracking==0 ) { @@ -3956,11 +4005,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } } while (true); - // InternalSyntacticSequencerTestLanguage.g:1395:3: ( (lv_val_2_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1396:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1415:3: ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1416:4: (lv_val_2_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1396:4: (lv_val_2_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1397:5: lv_val_2_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1416:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1417:5: lv_val_2_0= RULE_ID { lv_val_2_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4011,7 +4060,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleMandatoryManyTransition" - // InternalSyntacticSequencerTestLanguage.g:1417:1: entryRuleMandatoryManyTransition returns [EObject current=null] : iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF ; + // InternalSyntacticSequencerTestLanguage.g:1437:1: entryRuleMandatoryManyTransition returns [EObject current=null] : iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF ; public final EObject entryRuleMandatoryManyTransition() throws RecognitionException { EObject current = null; @@ -4019,8 +4068,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1417:64: (iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF ) - // InternalSyntacticSequencerTestLanguage.g:1418:2: iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF + // InternalSyntacticSequencerTestLanguage.g:1437:64: (iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF ) + // InternalSyntacticSequencerTestLanguage.g:1438:2: iv_ruleMandatoryManyTransition= ruleMandatoryManyTransition EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getMandatoryManyTransitionRule()); @@ -4051,7 +4100,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleMandatoryManyTransition" - // InternalSyntacticSequencerTestLanguage.g:1424:1: ruleMandatoryManyTransition returns [EObject current=null] : (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1444:1: ruleMandatoryManyTransition returns [EObject current=null] : (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) ; public final EObject ruleMandatoryManyTransition() throws RecognitionException { EObject current = null; @@ -4062,33 +4111,33 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1430:2: ( (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1431:2: (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1450:2: ( (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1451:2: (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1431:2: (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1432:3: otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1451:2: (otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1452:3: otherlv_0= '#10' ( ruleKW1 )+ ( (lv_val_2_0= RULE_ID ) ) { - otherlv_0=(Token)match(input,31,FollowSets000.FOLLOW_19); if (state.failed) return current; + otherlv_0=(Token)match(input,32,FollowSets000.FOLLOW_19); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getMandatoryManyTransitionAccess().getNumberSignDigitOneDigitZeroKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1436:3: ( ruleKW1 )+ + // InternalSyntacticSequencerTestLanguage.g:1456:3: ( ruleKW1 )+ int cnt18=0; loop18: do { int alt18=2; int LA18_0 = input.LA(1); - if ( (LA18_0==14||LA18_0==28) ) { + if ( (LA18_0==15||LA18_0==29) ) { alt18=1; } switch (alt18) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1437:4: ruleKW1 + // InternalSyntacticSequencerTestLanguage.g:1457:4: ruleKW1 { if ( state.backtracking==0 ) { @@ -4119,11 +4168,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern cnt18++; } while (true); - // InternalSyntacticSequencerTestLanguage.g:1445:3: ( (lv_val_2_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1446:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1465:3: ( (lv_val_2_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1466:4: (lv_val_2_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1446:4: (lv_val_2_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1447:5: lv_val_2_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1466:4: (lv_val_2_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1467:5: lv_val_2_0= RULE_ID { lv_val_2_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4174,7 +4223,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleAlternativeTransition" - // InternalSyntacticSequencerTestLanguage.g:1467:1: entryRuleAlternativeTransition returns [EObject current=null] : iv_ruleAlternativeTransition= ruleAlternativeTransition EOF ; + // InternalSyntacticSequencerTestLanguage.g:1487:1: entryRuleAlternativeTransition returns [EObject current=null] : iv_ruleAlternativeTransition= ruleAlternativeTransition EOF ; public final EObject entryRuleAlternativeTransition() throws RecognitionException { EObject current = null; @@ -4182,8 +4231,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1467:62: (iv_ruleAlternativeTransition= ruleAlternativeTransition EOF ) - // InternalSyntacticSequencerTestLanguage.g:1468:2: iv_ruleAlternativeTransition= ruleAlternativeTransition EOF + // InternalSyntacticSequencerTestLanguage.g:1487:62: (iv_ruleAlternativeTransition= ruleAlternativeTransition EOF ) + // InternalSyntacticSequencerTestLanguage.g:1488:2: iv_ruleAlternativeTransition= ruleAlternativeTransition EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getAlternativeTransitionRule()); @@ -4214,7 +4263,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleAlternativeTransition" - // InternalSyntacticSequencerTestLanguage.g:1474:1: ruleAlternativeTransition returns [EObject current=null] : (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1494:1: ruleAlternativeTransition returns [EObject current=null] : (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) ; public final EObject ruleAlternativeTransition() throws RecognitionException { EObject current = null; @@ -4226,26 +4275,26 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1480:2: ( (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1481:2: (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1500:2: ( (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1501:2: (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1481:2: (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1482:3: otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1501:2: (otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1502:3: otherlv_0= '#11' ( ruleKW1 | otherlv_2= 'kw2' ) ( (lv_val_3_0= RULE_ID ) ) { - otherlv_0=(Token)match(input,32,FollowSets000.FOLLOW_22); if (state.failed) return current; + otherlv_0=(Token)match(input,33,FollowSets000.FOLLOW_22); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getAlternativeTransitionAccess().getNumberSignDigitOneDigitOneKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1486:3: ( ruleKW1 | otherlv_2= 'kw2' ) + // InternalSyntacticSequencerTestLanguage.g:1506:3: ( ruleKW1 | otherlv_2= 'kw2' ) int alt19=2; int LA19_0 = input.LA(1); - if ( (LA19_0==14||LA19_0==28) ) { + if ( (LA19_0==15||LA19_0==29) ) { alt19=1; } - else if ( (LA19_0==15) ) { + else if ( (LA19_0==16) ) { alt19=2; } else { @@ -4257,7 +4306,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt19) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1487:4: ruleKW1 + // InternalSyntacticSequencerTestLanguage.g:1507:4: ruleKW1 { if ( state.backtracking==0 ) { @@ -4278,9 +4327,9 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:1495:4: otherlv_2= 'kw2' + // InternalSyntacticSequencerTestLanguage.g:1515:4: otherlv_2= 'kw2' { - otherlv_2=(Token)match(input,15,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_2=(Token)match(input,16,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getAlternativeTransitionAccess().getKw2Keyword_1_1()); @@ -4292,11 +4341,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1500:3: ( (lv_val_3_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1501:4: (lv_val_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1520:3: ( (lv_val_3_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1521:4: (lv_val_3_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1501:4: (lv_val_3_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1502:5: lv_val_3_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1521:4: (lv_val_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1522:5: lv_val_3_0= RULE_ID { lv_val_3_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4347,7 +4396,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleBooleanDatatypeID" - // InternalSyntacticSequencerTestLanguage.g:1522:1: entryRuleBooleanDatatypeID returns [String current=null] : iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF ; + // InternalSyntacticSequencerTestLanguage.g:1542:1: entryRuleBooleanDatatypeID returns [String current=null] : iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF ; public final String entryRuleBooleanDatatypeID() throws RecognitionException { String current = null; @@ -4355,8 +4404,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1522:57: (iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF ) - // InternalSyntacticSequencerTestLanguage.g:1523:2: iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF + // InternalSyntacticSequencerTestLanguage.g:1542:57: (iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF ) + // InternalSyntacticSequencerTestLanguage.g:1543:2: iv_ruleBooleanDatatypeID= ruleBooleanDatatypeID EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getBooleanDatatypeIDRule()); @@ -4387,7 +4436,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleBooleanDatatypeID" - // InternalSyntacticSequencerTestLanguage.g:1529:1: ruleBooleanDatatypeID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ; + // InternalSyntacticSequencerTestLanguage.g:1549:1: ruleBooleanDatatypeID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ; public final AntlrDatatypeRuleToken ruleBooleanDatatypeID() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -4397,8 +4446,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1535:2: (this_ID_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1536:2: this_ID_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1555:2: (this_ID_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1556:2: this_ID_0= RULE_ID { this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4433,7 +4482,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleBooleanValues" - // InternalSyntacticSequencerTestLanguage.g:1546:1: entryRuleBooleanValues returns [EObject current=null] : iv_ruleBooleanValues= ruleBooleanValues EOF ; + // InternalSyntacticSequencerTestLanguage.g:1566:1: entryRuleBooleanValues returns [EObject current=null] : iv_ruleBooleanValues= ruleBooleanValues EOF ; public final EObject entryRuleBooleanValues() throws RecognitionException { EObject current = null; @@ -4441,8 +4490,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1546:54: (iv_ruleBooleanValues= ruleBooleanValues EOF ) - // InternalSyntacticSequencerTestLanguage.g:1547:2: iv_ruleBooleanValues= ruleBooleanValues EOF + // InternalSyntacticSequencerTestLanguage.g:1566:54: (iv_ruleBooleanValues= ruleBooleanValues EOF ) + // InternalSyntacticSequencerTestLanguage.g:1567:2: iv_ruleBooleanValues= ruleBooleanValues EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getBooleanValuesRule()); @@ -4473,7 +4522,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleBooleanValues" - // InternalSyntacticSequencerTestLanguage.g:1553:1: ruleBooleanValues returns [EObject current=null] : ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) ; + // InternalSyntacticSequencerTestLanguage.g:1573:1: ruleBooleanValues returns [EObject current=null] : ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) ; public final EObject ruleBooleanValues() throws RecognitionException { EObject current = null; @@ -4487,14 +4536,14 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1559:2: ( ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) ) - // InternalSyntacticSequencerTestLanguage.g:1560:2: ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1579:2: ( ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) ) + // InternalSyntacticSequencerTestLanguage.g:1580:2: ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1560:2: ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1561:3: () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? + // InternalSyntacticSequencerTestLanguage.g:1580:2: ( () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1581:3: () otherlv_1= '#12' ( (lv_val1_2_0= 'kw1' ) )? ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? { - // InternalSyntacticSequencerTestLanguage.g:1561:3: () - // InternalSyntacticSequencerTestLanguage.g:1562:4: + // InternalSyntacticSequencerTestLanguage.g:1581:3: () + // InternalSyntacticSequencerTestLanguage.g:1582:4: { if ( state.backtracking==0 ) { @@ -4506,27 +4555,27 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - otherlv_1=(Token)match(input,33,FollowSets000.FOLLOW_23); if (state.failed) return current; + otherlv_1=(Token)match(input,34,FollowSets000.FOLLOW_23); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getBooleanValuesAccess().getNumberSignDigitOneDigitTwoKeyword_1()); } - // InternalSyntacticSequencerTestLanguage.g:1572:3: ( (lv_val1_2_0= 'kw1' ) )? + // InternalSyntacticSequencerTestLanguage.g:1592:3: ( (lv_val1_2_0= 'kw1' ) )? int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==14) ) { + if ( (LA20_0==15) ) { alt20=1; } switch (alt20) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1573:4: (lv_val1_2_0= 'kw1' ) + // InternalSyntacticSequencerTestLanguage.g:1593:4: (lv_val1_2_0= 'kw1' ) { - // InternalSyntacticSequencerTestLanguage.g:1573:4: (lv_val1_2_0= 'kw1' ) - // InternalSyntacticSequencerTestLanguage.g:1574:5: lv_val1_2_0= 'kw1' + // InternalSyntacticSequencerTestLanguage.g:1593:4: (lv_val1_2_0= 'kw1' ) + // InternalSyntacticSequencerTestLanguage.g:1594:5: lv_val1_2_0= 'kw1' { - lv_val1_2_0=(Token)match(input,14,FollowSets000.FOLLOW_24); if (state.failed) return current; + lv_val1_2_0=(Token)match(input,15,FollowSets000.FOLLOW_24); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_val1_2_0, grammarAccess.getBooleanValuesAccess().getVal1Kw1Keyword_2_0()); @@ -4549,7 +4598,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1586:3: ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1606:3: ( (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) )? int alt21=2; int LA21_0 = input.LA(1); @@ -4558,10 +4607,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt21) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1587:4: (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) + // InternalSyntacticSequencerTestLanguage.g:1607:4: (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1587:4: (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) - // InternalSyntacticSequencerTestLanguage.g:1588:5: lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID + // InternalSyntacticSequencerTestLanguage.g:1607:4: (lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID ) + // InternalSyntacticSequencerTestLanguage.g:1608:5: lv_val2_3_0= RULE_BOOLEAN_TERMINAL_ID { lv_val2_3_0=(Token)match(input,RULE_BOOLEAN_TERMINAL_ID,FollowSets000.FOLLOW_25); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4590,7 +4639,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1604:3: ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? + // InternalSyntacticSequencerTestLanguage.g:1624:3: ( (lv_val3_4_0= ruleBooleanDatatypeID ) )? int alt22=2; int LA22_0 = input.LA(1); @@ -4599,10 +4648,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt22) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1605:4: (lv_val3_4_0= ruleBooleanDatatypeID ) + // InternalSyntacticSequencerTestLanguage.g:1625:4: (lv_val3_4_0= ruleBooleanDatatypeID ) { - // InternalSyntacticSequencerTestLanguage.g:1605:4: (lv_val3_4_0= ruleBooleanDatatypeID ) - // InternalSyntacticSequencerTestLanguage.g:1606:5: lv_val3_4_0= ruleBooleanDatatypeID + // InternalSyntacticSequencerTestLanguage.g:1625:4: (lv_val3_4_0= ruleBooleanDatatypeID ) + // InternalSyntacticSequencerTestLanguage.g:1626:5: lv_val3_4_0= ruleBooleanDatatypeID { if ( state.backtracking==0 ) { @@ -4661,7 +4710,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleLongAlternative" - // InternalSyntacticSequencerTestLanguage.g:1627:1: entryRuleLongAlternative returns [EObject current=null] : iv_ruleLongAlternative= ruleLongAlternative EOF ; + // InternalSyntacticSequencerTestLanguage.g:1647:1: entryRuleLongAlternative returns [EObject current=null] : iv_ruleLongAlternative= ruleLongAlternative EOF ; public final EObject entryRuleLongAlternative() throws RecognitionException { EObject current = null; @@ -4669,8 +4718,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1627:56: (iv_ruleLongAlternative= ruleLongAlternative EOF ) - // InternalSyntacticSequencerTestLanguage.g:1628:2: iv_ruleLongAlternative= ruleLongAlternative EOF + // InternalSyntacticSequencerTestLanguage.g:1647:56: (iv_ruleLongAlternative= ruleLongAlternative EOF ) + // InternalSyntacticSequencerTestLanguage.g:1648:2: iv_ruleLongAlternative= ruleLongAlternative EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getLongAlternativeRule()); @@ -4701,7 +4750,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleLongAlternative" - // InternalSyntacticSequencerTestLanguage.g:1634:1: ruleLongAlternative returns [EObject current=null] : (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) ; + // InternalSyntacticSequencerTestLanguage.g:1654:1: ruleLongAlternative returns [EObject current=null] : (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) ; public final EObject ruleLongAlternative() throws RecognitionException { EObject current = null; @@ -4729,23 +4778,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1640:2: ( (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) ) - // InternalSyntacticSequencerTestLanguage.g:1641:2: (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) + // InternalSyntacticSequencerTestLanguage.g:1660:2: ( (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) ) + // InternalSyntacticSequencerTestLanguage.g:1661:2: (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) { - // InternalSyntacticSequencerTestLanguage.g:1641:2: (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) - // InternalSyntacticSequencerTestLanguage.g:1642:3: otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' + // InternalSyntacticSequencerTestLanguage.g:1661:2: (otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' ) + // InternalSyntacticSequencerTestLanguage.g:1662:3: otherlv_0= '#13' ( (lv_foo_1_0= RULE_ID ) ) ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* otherlv_18= '!' { - otherlv_0=(Token)match(input,34,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_0=(Token)match(input,35,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getLongAlternativeAccess().getNumberSignDigitOneDigitThreeKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1646:3: ( (lv_foo_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1647:4: (lv_foo_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1666:3: ( (lv_foo_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1667:4: (lv_foo_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1647:4: (lv_foo_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1648:5: lv_foo_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1667:4: (lv_foo_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1668:5: lv_foo_1_0= RULE_ID { lv_foo_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4771,47 +4820,47 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1664:3: ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* + // InternalSyntacticSequencerTestLanguage.g:1684:3: ( (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) | (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) | (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) | (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) | (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) | (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) | (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) | (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) )* loop31: do { int alt31=9; switch ( input.LA(1) ) { - case 14: + case 15: { alt31=1; } break; - case 15: + case 16: { alt31=2; } break; - case 16: + case 17: { alt31=3; } break; - case 17: + case 18: { alt31=4; } break; - case 35: + case 36: { alt31=5; } break; - case 36: + case 37: { alt31=6; } break; - case 37: + case 38: { alt31=7; } break; - case 38: + case 39: { alt31=8; } @@ -4821,18 +4870,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern switch (alt31) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1665:4: (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1685:4: (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1665:4: (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1666:5: otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1685:4: (otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1686:5: otherlv_2= 'kw1' ( (lv_val1_3_0= RULE_ID ) )? { - otherlv_2=(Token)match(input,14,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_2=(Token)match(input,15,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getLongAlternativeAccess().getKw1Keyword_2_0_0()); } - // InternalSyntacticSequencerTestLanguage.g:1670:5: ( (lv_val1_3_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1690:5: ( (lv_val1_3_0= RULE_ID ) )? int alt23=2; int LA23_0 = input.LA(1); @@ -4841,10 +4890,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt23) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1671:6: (lv_val1_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1691:6: (lv_val1_3_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1671:6: (lv_val1_3_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1672:7: lv_val1_3_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1691:6: (lv_val1_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1692:7: lv_val1_3_0= RULE_ID { lv_val1_3_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4880,18 +4929,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 2 : - // InternalSyntacticSequencerTestLanguage.g:1690:4: (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1710:4: (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1690:4: (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1691:5: otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1710:4: (otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1711:5: otherlv_4= 'kw2' ( (lv_val2_5_0= RULE_ID ) )? { - otherlv_4=(Token)match(input,15,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_4=(Token)match(input,16,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getLongAlternativeAccess().getKw2Keyword_2_1_0()); } - // InternalSyntacticSequencerTestLanguage.g:1695:5: ( (lv_val2_5_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1715:5: ( (lv_val2_5_0= RULE_ID ) )? int alt24=2; int LA24_0 = input.LA(1); @@ -4900,10 +4949,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt24) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1696:6: (lv_val2_5_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1716:6: (lv_val2_5_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1696:6: (lv_val2_5_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1697:7: lv_val2_5_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1716:6: (lv_val2_5_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1717:7: lv_val2_5_0= RULE_ID { lv_val2_5_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4939,18 +4988,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 3 : - // InternalSyntacticSequencerTestLanguage.g:1715:4: (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1735:4: (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1715:4: (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1716:5: otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1735:4: (otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1736:5: otherlv_6= 'kw3' ( (lv_val3_7_0= RULE_ID ) )? { - otherlv_6=(Token)match(input,16,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_6=(Token)match(input,17,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getLongAlternativeAccess().getKw3Keyword_2_2_0()); } - // InternalSyntacticSequencerTestLanguage.g:1720:5: ( (lv_val3_7_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1740:5: ( (lv_val3_7_0= RULE_ID ) )? int alt25=2; int LA25_0 = input.LA(1); @@ -4959,10 +5008,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt25) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1721:6: (lv_val3_7_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1741:6: (lv_val3_7_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1721:6: (lv_val3_7_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1722:7: lv_val3_7_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1741:6: (lv_val3_7_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1742:7: lv_val3_7_0= RULE_ID { lv_val3_7_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -4998,18 +5047,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 4 : - // InternalSyntacticSequencerTestLanguage.g:1740:4: (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1760:4: (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1740:4: (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1741:5: otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1760:4: (otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1761:5: otherlv_8= 'kw4' ( (lv_val4_9_0= RULE_ID ) )? { - otherlv_8=(Token)match(input,17,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_8=(Token)match(input,18,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getLongAlternativeAccess().getKw4Keyword_2_3_0()); } - // InternalSyntacticSequencerTestLanguage.g:1745:5: ( (lv_val4_9_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1765:5: ( (lv_val4_9_0= RULE_ID ) )? int alt26=2; int LA26_0 = input.LA(1); @@ -5018,10 +5067,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt26) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1746:6: (lv_val4_9_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1766:6: (lv_val4_9_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1746:6: (lv_val4_9_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1747:7: lv_val4_9_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1766:6: (lv_val4_9_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1767:7: lv_val4_9_0= RULE_ID { lv_val4_9_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5057,18 +5106,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 5 : - // InternalSyntacticSequencerTestLanguage.g:1765:4: (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1785:4: (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1765:4: (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1766:5: otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1785:4: (otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1786:5: otherlv_10= 'kw5' ( (lv_val5_11_0= RULE_ID ) )? { - otherlv_10=(Token)match(input,35,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_10=(Token)match(input,36,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_10, grammarAccess.getLongAlternativeAccess().getKw5Keyword_2_4_0()); } - // InternalSyntacticSequencerTestLanguage.g:1770:5: ( (lv_val5_11_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1790:5: ( (lv_val5_11_0= RULE_ID ) )? int alt27=2; int LA27_0 = input.LA(1); @@ -5077,10 +5126,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt27) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1771:6: (lv_val5_11_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1791:6: (lv_val5_11_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1771:6: (lv_val5_11_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1772:7: lv_val5_11_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1791:6: (lv_val5_11_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1792:7: lv_val5_11_0= RULE_ID { lv_val5_11_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5116,18 +5165,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 6 : - // InternalSyntacticSequencerTestLanguage.g:1790:4: (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1810:4: (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1790:4: (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1791:5: otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1810:4: (otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1811:5: otherlv_12= 'kw6' ( (lv_val6_13_0= RULE_ID ) )? { - otherlv_12=(Token)match(input,36,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_12=(Token)match(input,37,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_12, grammarAccess.getLongAlternativeAccess().getKw6Keyword_2_5_0()); } - // InternalSyntacticSequencerTestLanguage.g:1795:5: ( (lv_val6_13_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1815:5: ( (lv_val6_13_0= RULE_ID ) )? int alt28=2; int LA28_0 = input.LA(1); @@ -5136,10 +5185,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt28) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1796:6: (lv_val6_13_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1816:6: (lv_val6_13_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1796:6: (lv_val6_13_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1797:7: lv_val6_13_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1816:6: (lv_val6_13_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1817:7: lv_val6_13_0= RULE_ID { lv_val6_13_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5175,18 +5224,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 7 : - // InternalSyntacticSequencerTestLanguage.g:1815:4: (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1835:4: (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1815:4: (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1816:5: otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1835:4: (otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1836:5: otherlv_14= 'kw7' ( (lv_val7_15_0= RULE_ID ) )? { - otherlv_14=(Token)match(input,37,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_14=(Token)match(input,38,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_14, grammarAccess.getLongAlternativeAccess().getKw7Keyword_2_6_0()); } - // InternalSyntacticSequencerTestLanguage.g:1820:5: ( (lv_val7_15_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1840:5: ( (lv_val7_15_0= RULE_ID ) )? int alt29=2; int LA29_0 = input.LA(1); @@ -5195,10 +5244,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt29) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1821:6: (lv_val7_15_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1841:6: (lv_val7_15_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1821:6: (lv_val7_15_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1822:7: lv_val7_15_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1841:6: (lv_val7_15_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1842:7: lv_val7_15_0= RULE_ID { lv_val7_15_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5234,18 +5283,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } break; case 8 : - // InternalSyntacticSequencerTestLanguage.g:1840:4: (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1860:4: (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) { - // InternalSyntacticSequencerTestLanguage.g:1840:4: (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) - // InternalSyntacticSequencerTestLanguage.g:1841:5: otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1860:4: (otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? ) + // InternalSyntacticSequencerTestLanguage.g:1861:5: otherlv_16= 'kw8' ( (lv_val8_17_0= RULE_ID ) )? { - otherlv_16=(Token)match(input,38,FollowSets000.FOLLOW_27); if (state.failed) return current; + otherlv_16=(Token)match(input,39,FollowSets000.FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_16, grammarAccess.getLongAlternativeAccess().getKw8Keyword_2_7_0()); } - // InternalSyntacticSequencerTestLanguage.g:1845:5: ( (lv_val8_17_0= RULE_ID ) )? + // InternalSyntacticSequencerTestLanguage.g:1865:5: ( (lv_val8_17_0= RULE_ID ) )? int alt30=2; int LA30_0 = input.LA(1); @@ -5254,10 +5303,10 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt30) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1846:6: (lv_val8_17_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1866:6: (lv_val8_17_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1846:6: (lv_val8_17_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1847:7: lv_val8_17_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1866:6: (lv_val8_17_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1867:7: lv_val8_17_0= RULE_ID { lv_val8_17_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_26); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5298,7 +5347,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } } while (true); - otherlv_18=(Token)match(input,39,FollowSets000.FOLLOW_2); if (state.failed) return current; + otherlv_18=(Token)match(input,40,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_18, grammarAccess.getLongAlternativeAccess().getExclamationMarkKeyword_3()); @@ -5329,7 +5378,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleActionOnly" - // InternalSyntacticSequencerTestLanguage.g:1873:1: entryRuleActionOnly returns [EObject current=null] : iv_ruleActionOnly= ruleActionOnly EOF ; + // InternalSyntacticSequencerTestLanguage.g:1893:1: entryRuleActionOnly returns [EObject current=null] : iv_ruleActionOnly= ruleActionOnly EOF ; public final EObject entryRuleActionOnly() throws RecognitionException { EObject current = null; @@ -5337,8 +5386,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1873:51: (iv_ruleActionOnly= ruleActionOnly EOF ) - // InternalSyntacticSequencerTestLanguage.g:1874:2: iv_ruleActionOnly= ruleActionOnly EOF + // InternalSyntacticSequencerTestLanguage.g:1893:51: (iv_ruleActionOnly= ruleActionOnly EOF ) + // InternalSyntacticSequencerTestLanguage.g:1894:2: iv_ruleActionOnly= ruleActionOnly EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getActionOnlyRule()); @@ -5369,7 +5418,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleActionOnly" - // InternalSyntacticSequencerTestLanguage.g:1880:1: ruleActionOnly returns [EObject current=null] : (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) ; + // InternalSyntacticSequencerTestLanguage.g:1900:1: ruleActionOnly returns [EObject current=null] : (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) ; public final EObject ruleActionOnly() throws RecognitionException { EObject current = null; @@ -5383,30 +5432,30 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1886:2: ( (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) ) - // InternalSyntacticSequencerTestLanguage.g:1887:2: (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) + // InternalSyntacticSequencerTestLanguage.g:1906:2: ( (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) ) + // InternalSyntacticSequencerTestLanguage.g:1907:2: (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) { - // InternalSyntacticSequencerTestLanguage.g:1887:2: (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) - // InternalSyntacticSequencerTestLanguage.g:1888:3: otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? + // InternalSyntacticSequencerTestLanguage.g:1907:2: (otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? ) + // InternalSyntacticSequencerTestLanguage.g:1908:3: otherlv_0= '#14' (otherlv_1= 'kw1' )? ( ( RULE_ID )=>this_ID_2= RULE_ID )? () (otherlv_4= 'kw2' )? (this_ID_5= RULE_ID )? { - otherlv_0=(Token)match(input,40,FollowSets000.FOLLOW_28); if (state.failed) return current; + otherlv_0=(Token)match(input,41,FollowSets000.FOLLOW_28); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getActionOnlyAccess().getNumberSignDigitOneDigitFourKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1892:3: (otherlv_1= 'kw1' )? + // InternalSyntacticSequencerTestLanguage.g:1912:3: (otherlv_1= 'kw1' )? int alt32=2; int LA32_0 = input.LA(1); - if ( (LA32_0==14) ) { + if ( (LA32_0==15) ) { alt32=1; } switch (alt32) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1893:4: otherlv_1= 'kw1' + // InternalSyntacticSequencerTestLanguage.g:1913:4: otherlv_1= 'kw1' { - otherlv_1=(Token)match(input,14,FollowSets000.FOLLOW_29); if (state.failed) return current; + otherlv_1=(Token)match(input,15,FollowSets000.FOLLOW_29); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getActionOnlyAccess().getKw1Keyword_1()); @@ -5418,7 +5467,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1898:3: ( ( RULE_ID )=>this_ID_2= RULE_ID )? + // InternalSyntacticSequencerTestLanguage.g:1918:3: ( ( RULE_ID )=>this_ID_2= RULE_ID )? int alt33=2; int LA33_0 = input.LA(1); @@ -5431,7 +5480,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt33) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1899:4: ( RULE_ID )=>this_ID_2= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1919:4: ( RULE_ID )=>this_ID_2= RULE_ID { this_ID_2=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_29); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5445,8 +5494,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1905:3: () - // InternalSyntacticSequencerTestLanguage.g:1906:4: + // InternalSyntacticSequencerTestLanguage.g:1925:3: () + // InternalSyntacticSequencerTestLanguage.g:1926:4: { if ( state.backtracking==0 ) { @@ -5458,18 +5507,18 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1912:3: (otherlv_4= 'kw2' )? + // InternalSyntacticSequencerTestLanguage.g:1932:3: (otherlv_4= 'kw2' )? int alt34=2; int LA34_0 = input.LA(1); - if ( (LA34_0==15) ) { + if ( (LA34_0==16) ) { alt34=1; } switch (alt34) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1913:4: otherlv_4= 'kw2' + // InternalSyntacticSequencerTestLanguage.g:1933:4: otherlv_4= 'kw2' { - otherlv_4=(Token)match(input,15,FollowSets000.FOLLOW_25); if (state.failed) return current; + otherlv_4=(Token)match(input,16,FollowSets000.FOLLOW_25); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getActionOnlyAccess().getKw2Keyword_4()); @@ -5481,7 +5530,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } - // InternalSyntacticSequencerTestLanguage.g:1918:3: (this_ID_5= RULE_ID )? + // InternalSyntacticSequencerTestLanguage.g:1938:3: (this_ID_5= RULE_ID )? int alt35=2; int LA35_0 = input.LA(1); @@ -5490,7 +5539,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } switch (alt35) { case 1 : - // InternalSyntacticSequencerTestLanguage.g:1919:4: this_ID_5= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1939:4: this_ID_5= RULE_ID { this_ID_5=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5529,7 +5578,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleFragmentCaller" - // InternalSyntacticSequencerTestLanguage.g:1928:1: entryRuleFragmentCaller returns [EObject current=null] : iv_ruleFragmentCaller= ruleFragmentCaller EOF ; + // InternalSyntacticSequencerTestLanguage.g:1948:1: entryRuleFragmentCaller returns [EObject current=null] : iv_ruleFragmentCaller= ruleFragmentCaller EOF ; public final EObject entryRuleFragmentCaller() throws RecognitionException { EObject current = null; @@ -5537,8 +5586,8 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern try { - // InternalSyntacticSequencerTestLanguage.g:1928:55: (iv_ruleFragmentCaller= ruleFragmentCaller EOF ) - // InternalSyntacticSequencerTestLanguage.g:1929:2: iv_ruleFragmentCaller= ruleFragmentCaller EOF + // InternalSyntacticSequencerTestLanguage.g:1948:55: (iv_ruleFragmentCaller= ruleFragmentCaller EOF ) + // InternalSyntacticSequencerTestLanguage.g:1949:2: iv_ruleFragmentCaller= ruleFragmentCaller EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getFragmentCallerRule()); @@ -5569,7 +5618,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleFragmentCaller" - // InternalSyntacticSequencerTestLanguage.g:1935:1: ruleFragmentCaller returns [EObject current=null] : (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) ; + // InternalSyntacticSequencerTestLanguage.g:1955:1: ruleFragmentCaller returns [EObject current=null] : (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) ; public final EObject ruleFragmentCaller() throws RecognitionException { EObject current = null; @@ -5583,23 +5632,23 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:1941:2: ( (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1942:2: (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1961:2: ( (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1962:2: (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) { - // InternalSyntacticSequencerTestLanguage.g:1942:2: (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:1943:3: otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1962:2: (otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:1963:3: otherlv_0= '#15' ( (lv_val1_1_0= RULE_ID ) ) this_Fragment1_2= ruleFragment1[$current] ( (lv_val_3_0= RULE_ID ) ) { - otherlv_0=(Token)match(input,41,FollowSets000.FOLLOW_3); if (state.failed) return current; + otherlv_0=(Token)match(input,42,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getFragmentCallerAccess().getNumberSignDigitOneDigitFiveKeyword_0()); } - // InternalSyntacticSequencerTestLanguage.g:1947:3: ( (lv_val1_1_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1948:4: (lv_val1_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1967:3: ( (lv_val1_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1968:4: (lv_val1_1_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1948:4: (lv_val1_1_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1949:5: lv_val1_1_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1968:4: (lv_val1_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1969:5: lv_val1_1_0= RULE_ID { lv_val1_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_3); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5644,11 +5693,11 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern afterParserOrEnumRuleCall(); } - // InternalSyntacticSequencerTestLanguage.g:1976:3: ( (lv_val_3_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:1977:4: (lv_val_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1996:3: ( (lv_val_3_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:1997:4: (lv_val_3_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:1977:4: (lv_val_3_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1978:5: lv_val_3_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1997:4: (lv_val_3_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1998:5: lv_val_3_0= RULE_ID { lv_val_3_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5699,7 +5748,7 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern // $ANTLR start "ruleFragment1" - // InternalSyntacticSequencerTestLanguage.g:1999:1: ruleFragment1[EObject in_current] returns [EObject current=in_current] : ( (lv_fragVal_0_0= RULE_ID ) ) ; + // InternalSyntacticSequencerTestLanguage.g:2019:1: ruleFragment1[EObject in_current] returns [EObject current=in_current] : ( (lv_fragVal_0_0= RULE_ID ) ) ; public final EObject ruleFragment1(EObject in_current) throws RecognitionException { EObject current = in_current; @@ -5709,14 +5758,14 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern enterRule(); try { - // InternalSyntacticSequencerTestLanguage.g:2005:2: ( ( (lv_fragVal_0_0= RULE_ID ) ) ) - // InternalSyntacticSequencerTestLanguage.g:2006:2: ( (lv_fragVal_0_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:2025:2: ( ( (lv_fragVal_0_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:2026:2: ( (lv_fragVal_0_0= RULE_ID ) ) { - // InternalSyntacticSequencerTestLanguage.g:2006:2: ( (lv_fragVal_0_0= RULE_ID ) ) - // InternalSyntacticSequencerTestLanguage.g:2007:3: (lv_fragVal_0_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:2026:2: ( (lv_fragVal_0_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:2027:3: (lv_fragVal_0_0= RULE_ID ) { - // InternalSyntacticSequencerTestLanguage.g:2007:3: (lv_fragVal_0_0= RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:2008:4: lv_fragVal_0_0= RULE_ID + // InternalSyntacticSequencerTestLanguage.g:2027:3: (lv_fragVal_0_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:2028:4: lv_fragVal_0_0= RULE_ID { lv_fragVal_0_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -5762,10 +5811,128 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern } // $ANTLR end "ruleFragment1" + + // $ANTLR start "entryRuleBug398890" + // InternalSyntacticSequencerTestLanguage.g:2047:1: entryRuleBug398890 returns [EObject current=null] : iv_ruleBug398890= ruleBug398890 EOF ; + public final EObject entryRuleBug398890() throws RecognitionException { + EObject current = null; + + EObject iv_ruleBug398890 = null; + + + try { + // InternalSyntacticSequencerTestLanguage.g:2047:50: (iv_ruleBug398890= ruleBug398890 EOF ) + // InternalSyntacticSequencerTestLanguage.g:2048:2: iv_ruleBug398890= ruleBug398890 EOF + { + if ( state.backtracking==0 ) { + newCompositeNode(grammarAccess.getBug398890Rule()); + } + pushFollow(FollowSets000.FOLLOW_1); + iv_ruleBug398890=ruleBug398890(); + + state._fsp--; + if (state.failed) return current; + if ( state.backtracking==0 ) { + current =iv_ruleBug398890; + } + match(input,EOF,FollowSets000.FOLLOW_2); if (state.failed) return current; + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleBug398890" + + + // $ANTLR start "ruleBug398890" + // InternalSyntacticSequencerTestLanguage.g:2054:1: ruleBug398890 returns [EObject current=null] : (this_C_COMMENT_END_0= RULE_C_COMMENT_END ( (lv_name_1_0= RULE_ID ) ) ) ; + public final EObject ruleBug398890() throws RecognitionException { + EObject current = null; + + Token this_C_COMMENT_END_0=null; + Token lv_name_1_0=null; + + + enterRule(); + + try { + // InternalSyntacticSequencerTestLanguage.g:2060:2: ( (this_C_COMMENT_END_0= RULE_C_COMMENT_END ( (lv_name_1_0= RULE_ID ) ) ) ) + // InternalSyntacticSequencerTestLanguage.g:2061:2: (this_C_COMMENT_END_0= RULE_C_COMMENT_END ( (lv_name_1_0= RULE_ID ) ) ) + { + // InternalSyntacticSequencerTestLanguage.g:2061:2: (this_C_COMMENT_END_0= RULE_C_COMMENT_END ( (lv_name_1_0= RULE_ID ) ) ) + // InternalSyntacticSequencerTestLanguage.g:2062:3: this_C_COMMENT_END_0= RULE_C_COMMENT_END ( (lv_name_1_0= RULE_ID ) ) + { + this_C_COMMENT_END_0=(Token)match(input,RULE_C_COMMENT_END,FollowSets000.FOLLOW_3); if (state.failed) return current; + if ( state.backtracking==0 ) { + + newLeafNode(this_C_COMMENT_END_0, grammarAccess.getBug398890Access().getC_COMMENT_ENDTerminalRuleCall_0()); + + } + // InternalSyntacticSequencerTestLanguage.g:2066:3: ( (lv_name_1_0= RULE_ID ) ) + // InternalSyntacticSequencerTestLanguage.g:2067:4: (lv_name_1_0= RULE_ID ) + { + // InternalSyntacticSequencerTestLanguage.g:2067:4: (lv_name_1_0= RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:2068:5: lv_name_1_0= RULE_ID + { + lv_name_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return current; + if ( state.backtracking==0 ) { + + newLeafNode(lv_name_1_0, grammarAccess.getBug398890Access().getNameIDTerminalRuleCall_1_0()); + + } + if ( state.backtracking==0 ) { + + if (current==null) { + current = createModelElement(grammarAccess.getBug398890Rule()); + } + setWithLastConsumed( + current, + "name", + lv_name_1_0, + "org.eclipse.xtext.common.Terminals.ID"); + + } + + } + + + } + + + } + + + } + + if ( state.backtracking==0 ) { + + leaveRule(); + + } + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleBug398890" + // $ANTLR start synpred1_InternalSyntacticSequencerTestLanguage public final void synpred1_InternalSyntacticSequencerTestLanguage_fragment() throws RecognitionException { - // InternalSyntacticSequencerTestLanguage.g:1899:4: ( RULE_ID ) - // InternalSyntacticSequencerTestLanguage.g:1899:5: RULE_ID + // InternalSyntacticSequencerTestLanguage.g:1919:4: ( RULE_ID ) + // InternalSyntacticSequencerTestLanguage.g:1919:5: RULE_ID { match(input,RULE_ID,FollowSets000.FOLLOW_2); if (state.failed) return ; @@ -5798,32 +5965,32 @@ public class InternalSyntacticSequencerTestLanguageParser extends AbstractIntern public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000020000L}); - public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000080002L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000200010L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000400000L}); - public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000001000002L}); + public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000100002L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000400010L}); + public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000002000002L}); public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000030L}); - public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x000000000003C002L}); + public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000078002L}); public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000038002L}); - public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000030002L}); - public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000020002L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x000000000000C000L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000010004000L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000070002L}); + public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000060002L}); + public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000040002L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000018000L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000020008000L}); public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000042L}); - public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000010004010L}); - public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x000000001000C000L}); - public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000004092L}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000020008010L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000020018000L}); + public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000008092L}); public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000092L}); public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000012L}); - public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x000000F80003C000L}); - public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x000000F80003C010L}); - public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x000000000000C012L}); - public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000008012L}); + public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x000001F000078000L}); + public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x000001F000078010L}); + public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000018012L}); + public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000010012L}); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSemanticSequencer.java index 44e71a8af..f15ed1c03 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSemanticSequencer.java @@ -23,6 +23,7 @@ import org.eclipse.xtext.serializer.syntacticsequencertest.AlternativeTransition import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanAlternative; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanAlternativeLiteral; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanValues; +import org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890; import org.eclipse.xtext.serializer.syntacticsequencertest.FragmentCallerType; import org.eclipse.xtext.serializer.syntacticsequencertest.LongAlternative; import org.eclipse.xtext.serializer.syntacticsequencertest.MandatoryKeywords; @@ -76,6 +77,9 @@ public abstract class AbstractSyntacticSequencerTestLanguageSemanticSequencer ex case SyntacticsequencertestPackage.BOOLEAN_VALUES: sequence_BooleanValues(context, (BooleanValues) semanticObject); return; + case SyntacticsequencertestPackage.BUG398890: + sequence_Bug398890(context, (Bug398890) semanticObject); + return; case SyntacticsequencertestPackage.FRAGMENT_CALLER_TYPE: sequence_Fragment1_FragmentCaller(context, (FragmentCallerType) semanticObject); return; @@ -265,6 +269,24 @@ public abstract class AbstractSyntacticSequencerTestLanguageSemanticSequencer ex } + /** + * Contexts: + * Bug398890 returns Bug398890 + * + * Constraint: + * name=ID + */ + protected void sequence_Bug398890(ISerializationContext context, Bug398890 semanticObject) { + if (errorAcceptor != null) { + if (transientValues.isValueTransient(semanticObject, SyntacticsequencertestPackage.Literals.BUG398890__NAME) == ValueTransient.YES) + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SyntacticsequencertestPackage.Literals.BUG398890__NAME)); + } + SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); + feeder.accept(grammarAccess.getBug398890Access().getNameIDTerminalRuleCall_1_0(), semanticObject.getName()); + feeder.finish(); + } + + /** * Contexts: * FragmentCaller returns FragmentCallerType @@ -375,7 +397,8 @@ public abstract class AbstractSyntacticSequencerTestLanguageSemanticSequencer ex * x12=BooleanValues | * x13=LongAlternative | * x14=ActionOnly | - * x15=FragmentCaller + * x15=FragmentCaller | + * x16=Bug398890 * ) */ protected void sequence_Model(ISerializationContext context, Model semanticObject) { diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSyntacticSequencer.java index 5f2951fea..1fafcd790 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSyntacticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/serializer/AbstractSyntacticSequencerTestLanguageSyntacticSequencer.java @@ -76,6 +76,8 @@ public abstract class AbstractSyntacticSequencerTestLanguageSyntacticSequencer e return getBOOLEAN_TERMINAL_IDToken(semanticObject, ruleCall, node); else if (ruleCall.getRule() == grammarAccess.getBooleanDatatypeIDRule()) return getBooleanDatatypeIDToken(semanticObject, ruleCall, node); + else if (ruleCall.getRule() == grammarAccess.getC_COMMENT_ENDRule()) + return getC_COMMENT_ENDToken(semanticObject, ruleCall, node); else if (ruleCall.getRule() == grammarAccess.getIDRule()) return getIDToken(semanticObject, ruleCall, node); else if (ruleCall.getRule() == grammarAccess.getKW1Rule()) @@ -103,6 +105,15 @@ public abstract class AbstractSyntacticSequencerTestLanguageSyntacticSequencer e return ""; } + /** + * terminal C_COMMENT_END: '*/'; + */ + protected String getC_COMMENT_ENDToken(EObject semanticObject, RuleCall ruleCall, INode node) { + if (node != null) + return getTokenText(node); + return "*/"; + } + /** * terminal ID : '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; */ diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java index e6a9d26bb..942c48195 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java @@ -931,7 +931,7 @@ public class AssignmentFinderTestLanguageGrammarAccess extends AbstractGrammarEl } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java index cefb59caf..c39be6882 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java @@ -1185,7 +1185,7 @@ public class ContextFinderTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java index 6494a84cc..5035287d1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java @@ -44,7 +44,7 @@ public class HiddenTokenSequencerTestLanguageGrammarAccess extends AbstractGramm private final RuleCall cEntitiesEntityParserRuleCall_1_0 = (RuleCall)cEntitiesAssignment_1.eContents().get(0); private final Keyword cEndKeyword_2 = (Keyword)cGroup.eContents().get(2); - /// * SuppressWarnings[noInstantiation] * / DomainModel: + ///* SuppressWarnings[noInstantiation] */ DomainModel: // 'entities' // entities+=Entity* // 'end'; @@ -150,7 +150,7 @@ public class HiddenTokenSequencerTestLanguageGrammarAccess extends AbstractGramm return getModelAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / DomainModel: + ///* SuppressWarnings[noInstantiation] */ DomainModel: // 'entities' // entities+=Entity* // 'end'; @@ -193,7 +193,7 @@ public class HiddenTokenSequencerTestLanguageGrammarAccess extends AbstractGramm } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 bb82a7e91..e6cd74a08 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 @@ -3252,7 +3252,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java index 5b03120ef..828f17fab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java @@ -57,16 +57,20 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar private final RuleCall cX14ActionOnlyParserRuleCall_13_0 = (RuleCall)cX14Assignment_13.eContents().get(0); private final Assignment cX15Assignment_14 = (Assignment)cAlternatives.eContents().get(14); private final RuleCall cX15FragmentCallerParserRuleCall_14_0 = (RuleCall)cX15Assignment_14.eContents().get(0); + private final Assignment cX16Assignment_15 = (Assignment)cAlternatives.eContents().get(15); + private final RuleCall cX16Bug398890ParserRuleCall_15_0 = (RuleCall)cX16Assignment_15.eContents().get(0); //Model: // x1=MandatoryKeywords | x2=Exp0 | x3=Exp1 | x4=Exp2 | x5=SingleCrossReference | x6=BooleanAlternative | // x7=UnassignedDatatype | x8=OptionalSingleTransition | x9=OptionalManyTransition | x10=MandatoryManyTransition | - // x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller; + // x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller | + // x16=Bug398890; @Override public ParserRule getRule() { return rule; } //x1=MandatoryKeywords | x2=Exp0 | x3=Exp1 | x4=Exp2 | x5=SingleCrossReference | x6=BooleanAlternative | //x7=UnassignedDatatype | x8=OptionalSingleTransition | x9=OptionalManyTransition | x10=MandatoryManyTransition | - //x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller + //x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller | + //x16=Bug398890 public Alternatives getAlternatives() { return cAlternatives; } //x1=MandatoryKeywords @@ -158,6 +162,12 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar //FragmentCaller public RuleCall getX15FragmentCallerParserRuleCall_14_0() { return cX15FragmentCallerParserRuleCall_14_0; } + + //x16=Bug398890 + public Assignment getX16Assignment_15() { return cX16Assignment_15; } + + //Bug398890 + public RuleCall getX16Bug398890ParserRuleCall_15_0() { return cX16Bug398890ParserRuleCall_15_0; } } public class MandatoryKeywordsElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage.MandatoryKeywords"); @@ -1176,6 +1186,29 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar //ID public RuleCall getFragValIDTerminalRuleCall_0() { return cFragValIDTerminalRuleCall_0; } } + public class Bug398890Elements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage.Bug398890"); + private final Group cGroup = (Group)rule.eContents().get(1); + private final RuleCall cC_COMMENT_ENDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0); + private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1); + private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); + + //Bug398890: + // C_COMMENT_END name=ID; + @Override public ParserRule getRule() { return rule; } + + //C_COMMENT_END name=ID + public Group getGroup() { return cGroup; } + + //C_COMMENT_END + public RuleCall getC_COMMENT_ENDTerminalRuleCall_0() { return cC_COMMENT_ENDTerminalRuleCall_0; } + + //name=ID + public Assignment getNameAssignment_1() { return cNameAssignment_1; } + + //ID + public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; } + } private final ModelElements pModel; @@ -1208,6 +1241,8 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar private final ActionOnlyElements pActionOnly; private final FragmentCallerElements pFragmentCaller; private final Fragment1Elements pFragment1; + private final Bug398890Elements pBug398890; + private final TerminalRule tC_COMMENT_END; private final Grammar grammar; @@ -1248,6 +1283,8 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar this.pActionOnly = new ActionOnlyElements(); this.pFragmentCaller = new FragmentCallerElements(); this.pFragment1 = new Fragment1Elements(); + this.pBug398890 = new Bug398890Elements(); + this.tC_COMMENT_END = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage.C_COMMENT_END"); } protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { @@ -1280,7 +1317,8 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar //Model: // x1=MandatoryKeywords | x2=Exp0 | x3=Exp1 | x4=Exp2 | x5=SingleCrossReference | x6=BooleanAlternative | // x7=UnassignedDatatype | x8=OptionalSingleTransition | x9=OptionalManyTransition | x10=MandatoryManyTransition | - // x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller; + // x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller | + // x16=Bug398890; public ModelElements getModelAccess() { return pModel; } @@ -1580,6 +1618,22 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar return getFragment1Access().getRule(); } + //Bug398890: + // C_COMMENT_END name=ID; + public Bug398890Elements getBug398890Access() { + return pBug398890; + } + + public ParserRule getBug398890Rule() { + return getBug398890Access().getRule(); + } + + //terminal C_COMMENT_END: + // '*/'; + public TerminalRule getC_COMMENT_ENDRule() { + return tC_COMMENT_END; + } + //terminal ID: // '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*; public TerminalRule getIDRule() { @@ -1600,7 +1654,7 @@ public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammar } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java new file mode 100644 index 000000000..f06959f84 --- /dev/null +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java @@ -0,0 +1,52 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.serializer.syntacticsequencertest; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Bug398890'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890#getName Name}
  • + *
+ * + * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getBug398890() + * @model + * @generated + */ +public interface Bug398890 extends EObject +{ + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getBug398890_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + +} // Bug398890 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java index 94a70e56e..8cb52d02f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX13 X13}
  • *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX14 X14}
  • *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX15 X15}
  • + *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX16 X16}
  • * * * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getModel() @@ -427,4 +428,30 @@ public interface Model extends EObject */ void setX15(FragmentCallerType value); + /** + * Returns the value of the 'X16' containment reference. + * + *

    + * If the meaning of the 'X16' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'X16' containment reference. + * @see #setX16(Bug398890) + * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getModel_X16() + * @model containment="true" + * @generated + */ + Bug398890 getX16(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX16 X16}' containment reference. + * + * + * @param value the new value of the 'X16' containment reference. + * @see #getX16() + * @generated + */ + void setX16(Bug398890 value); + } // Model diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestFactory.java index 5559f4c3f..9ff21c29f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestFactory.java @@ -176,6 +176,15 @@ public interface SyntacticsequencertestFactory extends EFactory */ FragmentCallerType createFragmentCallerType(); + /** + * Returns a new object of class 'Bug398890'. + * + * + * @return a new object of class 'Bug398890'. + * @generated + */ + Bug398890 createBug398890(); + /** * Returns a new object of class 'Add0'. * diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestPackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestPackage.java index 8bb3d33c9..f53149d6f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestPackage.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SyntacticsequencertestPackage.java @@ -202,6 +202,15 @@ public interface SyntacticsequencertestPackage extends EPackage */ int MODEL__X15 = 14; + /** + * The feature id for the 'X16' containment reference. + * + * + * @generated + * @ordered + */ + int MODEL__X16 = 15; + /** * The number of structural features of the 'Model' class. * @@ -209,7 +218,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @generated * @ordered */ - int MODEL_FEATURE_COUNT = 15; + int MODEL_FEATURE_COUNT = 16; /** * The meta object id for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.MandatoryKeywordsImpl Mandatory Keywords}' class. @@ -785,6 +794,34 @@ public interface SyntacticsequencertestPackage extends EPackage */ int FRAGMENT_CALLER_TYPE_FEATURE_COUNT = 3; + /** + * The meta object id for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.Bug398890Impl Bug398890}' class. + * + * + * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.Bug398890Impl + * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getBug398890() + * @generated + */ + int BUG398890 = 17; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int BUG398890__NAME = 0; + + /** + * The number of structural features of the 'Bug398890' class. + * + * + * @generated + * @ordered + */ + int BUG398890_FEATURE_COUNT = 1; + /** * The meta object id for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.Add0Impl Add0}' class. * @@ -793,7 +830,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getAdd0() * @generated */ - int ADD0 = 17; + int ADD0 = 18; /** * The feature id for the 'Left' containment reference. @@ -830,7 +867,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getVal0() * @generated */ - int VAL0 = 18; + int VAL0 = 19; /** * The feature id for the 'Name' attribute. @@ -858,7 +895,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getAdd1() * @generated */ - int ADD1 = 19; + int ADD1 = 20; /** * The feature id for the 'Left' containment reference. @@ -895,7 +932,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getVal1() * @generated */ - int VAL1 = 20; + int VAL1 = 21; /** * The feature id for the 'Name' attribute. @@ -923,7 +960,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getAdd2() * @generated */ - int ADD2 = 21; + int ADD2 = 22; /** * The feature id for the 'Left' containment reference. @@ -960,7 +997,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getMult2() * @generated */ - int MULT2 = 22; + int MULT2 = 23; /** * The feature id for the 'Left' containment reference. @@ -997,7 +1034,7 @@ public interface SyntacticsequencertestPackage extends EPackage * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getVal2() * @generated */ - int VAL2 = 23; + int VAL2 = 24; /** * The feature id for the 'Name' attribute. @@ -1193,6 +1230,17 @@ public interface SyntacticsequencertestPackage extends EPackage */ EReference getModel_X15(); + /** + * Returns the meta object for the containment reference '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX16 X16}'. + * + * + * @return the meta object for the containment reference 'X16'. + * @see org.eclipse.xtext.serializer.syntacticsequencertest.Model#getX16() + * @see #getModel() + * @generated + */ + EReference getModel_X16(); + /** * Returns the meta object for class '{@link org.eclipse.xtext.serializer.syntacticsequencertest.MandatoryKeywords Mandatory Keywords}'. * @@ -1683,6 +1731,27 @@ public interface SyntacticsequencertestPackage extends EPackage */ EAttribute getFragmentCallerType_FragVal(); + /** + * Returns the meta object for class '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890 Bug398890}'. + * + * + * @return the meta object for class 'Bug398890'. + * @see org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890 + * @generated + */ + EClass getBug398890(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890#getName() + * @see #getBug398890() + * @generated + */ + EAttribute getBug398890_Name(); + /** * Returns the meta object for class '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Add0 Add0}'. * @@ -2027,6 +2096,14 @@ public interface SyntacticsequencertestPackage extends EPackage */ EReference MODEL__X15 = eINSTANCE.getModel_X15(); + /** + * The meta object literal for the 'X16' containment reference feature. + * + * + * @generated + */ + EReference MODEL__X16 = eINSTANCE.getModel_X16(); + /** * The meta object literal for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.MandatoryKeywordsImpl Mandatory Keywords}' class. * @@ -2427,6 +2504,24 @@ public interface SyntacticsequencertestPackage extends EPackage */ EAttribute FRAGMENT_CALLER_TYPE__FRAG_VAL = eINSTANCE.getFragmentCallerType_FragVal(); + /** + * The meta object literal for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.Bug398890Impl Bug398890}' class. + * + * + * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.Bug398890Impl + * @see org.eclipse.xtext.serializer.syntacticsequencertest.impl.SyntacticsequencertestPackageImpl#getBug398890() + * @generated + */ + EClass BUG398890 = eINSTANCE.getBug398890(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + EAttribute BUG398890__NAME = eINSTANCE.getBug398890_Name(); + /** * The meta object literal for the '{@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.Add0Impl Add0}' class. * diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java new file mode 100644 index 000000000..a6ac46d51 --- /dev/null +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java @@ -0,0 +1,178 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.serializer.syntacticsequencertest.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890; +import org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage; + +/** + * + * An implementation of the model object 'Bug398890'. + * + *

    + * The following features are implemented: + *

    + *
      + *
    • {@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.Bug398890Impl#getName Name}
    • + *
    + * + * @generated + */ +public class Bug398890Impl extends MinimalEObjectImpl.Container implements Bug398890 +{ + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected Bug398890Impl() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return SyntacticsequencertestPackage.Literals.BUG398890; + } + + /** + * + * + * @generated + */ + public String getName() + { + return name; + } + + /** + * + * + * @generated + */ + public void setName(String newName) + { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SyntacticsequencertestPackage.BUG398890__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case SyntacticsequencertestPackage.BUG398890__NAME: + return getName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case SyntacticsequencertestPackage.BUG398890__NAME: + setName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case SyntacticsequencertestPackage.BUG398890__NAME: + setName(NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case SyntacticsequencertestPackage.BUG398890__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + +} //Bug398890Impl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java index 69fb2f458..b739eae9f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java @@ -16,6 +16,7 @@ import org.eclipse.xtext.serializer.syntacticsequencertest.ActionOnly; import org.eclipse.xtext.serializer.syntacticsequencertest.AlternativeTransition; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanAlternative; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanValues; +import org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp0; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp1; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp2; @@ -53,6 +54,7 @@ import org.eclipse.xtext.serializer.syntacticsequencertest.UnassignedDatatype; *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.ModelImpl#getX13 X13}
  • *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.ModelImpl#getX14 X14}
  • *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.ModelImpl#getX15 X15}
  • + *
  • {@link org.eclipse.xtext.serializer.syntacticsequencertest.impl.ModelImpl#getX16 X16}
  • * * * @generated @@ -209,6 +211,16 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model */ protected FragmentCallerType x15; + /** + * The cached value of the '{@link #getX16() X16}' containment reference. + * + * + * @see #getX16() + * @generated + * @ordered + */ + protected Bug398890 x16; + /** * * @@ -950,6 +962,54 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model eNotify(new ENotificationImpl(this, Notification.SET, SyntacticsequencertestPackage.MODEL__X15, newX15, newX15)); } + /** + * + * + * @generated + */ + public Bug398890 getX16() + { + return x16; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetX16(Bug398890 newX16, NotificationChain msgs) + { + Bug398890 oldX16 = x16; + x16 = newX16; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SyntacticsequencertestPackage.MODEL__X16, oldX16, newX16); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setX16(Bug398890 newX16) + { + if (newX16 != x16) + { + NotificationChain msgs = null; + if (x16 != null) + msgs = ((InternalEObject)x16).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SyntacticsequencertestPackage.MODEL__X16, null, msgs); + if (newX16 != null) + msgs = ((InternalEObject)newX16).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SyntacticsequencertestPackage.MODEL__X16, null, msgs); + msgs = basicSetX16(newX16, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SyntacticsequencertestPackage.MODEL__X16, newX16, newX16)); + } + /** * * @@ -990,6 +1050,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return basicSetX14(null, msgs); case SyntacticsequencertestPackage.MODEL__X15: return basicSetX15(null, msgs); + case SyntacticsequencertestPackage.MODEL__X16: + return basicSetX16(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -1034,6 +1096,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return getX14(); case SyntacticsequencertestPackage.MODEL__X15: return getX15(); + case SyntacticsequencertestPackage.MODEL__X16: + return getX16(); } return super.eGet(featureID, resolve, coreType); } @@ -1093,6 +1157,9 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model case SyntacticsequencertestPackage.MODEL__X15: setX15((FragmentCallerType)newValue); return; + case SyntacticsequencertestPackage.MODEL__X16: + setX16((Bug398890)newValue); + return; } super.eSet(featureID, newValue); } @@ -1152,6 +1219,9 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model case SyntacticsequencertestPackage.MODEL__X15: setX15((FragmentCallerType)null); return; + case SyntacticsequencertestPackage.MODEL__X16: + setX16((Bug398890)null); + return; } super.eUnset(featureID); } @@ -1196,6 +1266,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return x14 != null; case SyntacticsequencertestPackage.MODEL__X15: return x15 != null; + case SyntacticsequencertestPackage.MODEL__X16: + return x16 != null; } return super.eIsSet(featureID); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java index 0c38c2835..459858ea5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java @@ -82,6 +82,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S case SyntacticsequencertestPackage.LONG_ALTERNATIVE: return createLongAlternative(); case SyntacticsequencertestPackage.ACTION_ONLY: return createActionOnly(); case SyntacticsequencertestPackage.FRAGMENT_CALLER_TYPE: return createFragmentCallerType(); + case SyntacticsequencertestPackage.BUG398890: return createBug398890(); case SyntacticsequencertestPackage.ADD0: return createAdd0(); case SyntacticsequencertestPackage.VAL0: return createVal0(); case SyntacticsequencertestPackage.ADD1: return createAdd1(); @@ -281,6 +282,17 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S return fragmentCallerType; } + /** + * + * + * @generated + */ + public Bug398890 createBug398890() + { + Bug398890Impl bug398890 = new Bug398890Impl(); + return bug398890; + } + /** * * diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java index 9f26ba610..c4d93c144 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java @@ -19,6 +19,7 @@ import org.eclipse.xtext.serializer.syntacticsequencertest.AlternativeTransition import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanAlternative; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanAlternativeLiteral; import org.eclipse.xtext.serializer.syntacticsequencertest.BooleanValues; +import org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp0; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp1; import org.eclipse.xtext.serializer.syntacticsequencertest.Exp2; @@ -165,6 +166,13 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S */ private EClass fragmentCallerTypeEClass = null; + /** + * + * + * @generated + */ + private EClass bug398890EClass = null; + /** * * @@ -440,6 +448,16 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S return (EReference)modelEClass.getEStructuralFeatures().get(14); } + /** + * + * + * @generated + */ + public EReference getModel_X16() + { + return (EReference)modelEClass.getEStructuralFeatures().get(15); + } + /** * * @@ -900,6 +918,26 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(2); } + /** + * + * + * @generated + */ + public EClass getBug398890() + { + return bug398890EClass; + } + + /** + * + * + * @generated + */ + public EAttribute getBug398890_Name() + { + return (EAttribute)bug398890EClass.getEStructuralFeatures().get(0); + } + /** * * @@ -1126,6 +1164,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S createEReference(modelEClass, MODEL__X13); createEReference(modelEClass, MODEL__X14); createEReference(modelEClass, MODEL__X15); + createEReference(modelEClass, MODEL__X16); mandatoryKeywordsEClass = createEClass(MANDATORY_KEYWORDS); createEAttribute(mandatoryKeywordsEClass, MANDATORY_KEYWORDS__VAL1); @@ -1189,6 +1228,9 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S createEAttribute(fragmentCallerTypeEClass, FRAGMENT_CALLER_TYPE__VAL); createEAttribute(fragmentCallerTypeEClass, FRAGMENT_CALLER_TYPE__FRAG_VAL); + bug398890EClass = createEClass(BUG398890); + createEAttribute(bug398890EClass, BUG398890__NAME); + add0EClass = createEClass(ADD0); createEReference(add0EClass, ADD0__LEFT); createEReference(add0EClass, ADD0__RIGHT); @@ -1272,6 +1314,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S initEReference(getModel_X13(), this.getLongAlternative(), null, "x13", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getModel_X14(), this.getActionOnly(), null, "x14", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getModel_X15(), this.getFragmentCallerType(), null, "x15", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getModel_X16(), this.getBug398890(), null, "x16", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(mandatoryKeywordsEClass, MandatoryKeywords.class, "MandatoryKeywords", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMandatoryKeywords_Val1(), theEcorePackage.getEString(), "val1", null, 0, 1, MandatoryKeywords.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1335,6 +1378,9 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S initEAttribute(getFragmentCallerType_Val(), theEcorePackage.getEString(), "val", null, 0, 1, FragmentCallerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getFragmentCallerType_FragVal(), theEcorePackage.getEString(), "fragVal", null, 0, 1, FragmentCallerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(bug398890EClass, Bug398890.class, "Bug398890", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getBug398890_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Bug398890.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(add0EClass, Add0.class, "Add0", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getAdd0_Left(), this.getExp0(), null, "left", null, 0, 1, Add0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAdd0_Right(), this.getExp0(), null, "right", null, 0, 1, Add0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestAdapterFactory.java index 8ee2b5227..0164dfafb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestAdapterFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestAdapterFactory.java @@ -161,6 +161,11 @@ public class SyntacticsequencertestAdapterFactory extends AdapterFactoryImpl return createFragmentCallerTypeAdapter(); } @Override + public Adapter caseBug398890(Bug398890 object) + { + return createBug398890Adapter(); + } + @Override public Adapter caseAdd0(Add0 object) { return createAdd0Adapter(); @@ -472,6 +477,21 @@ public class SyntacticsequencertestAdapterFactory extends AdapterFactoryImpl return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890 Bug398890}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.xtext.serializer.syntacticsequencertest.Bug398890 + * @generated + */ + public Adapter createBug398890Adapter() + { + return null; + } + /** * Creates a new adapter for an object of class '{@link org.eclipse.xtext.serializer.syntacticsequencertest.Add0 Add0}'. * diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestSwitch.java index a61d688ee..1707d36e2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/util/SyntacticsequencertestSwitch.java @@ -192,6 +192,13 @@ public class SyntacticsequencertestSwitch extends Switch if (result == null) result = defaultCase(theEObject); return result; } + case SyntacticsequencertestPackage.BUG398890: + { + Bug398890 bug398890 = (Bug398890)theEObject; + T result = caseBug398890(bug398890); + if (result == null) result = defaultCase(theEObject); + return result; + } case SyntacticsequencertestPackage.ADD0: { Add0 add0 = (Add0)theEObject; @@ -524,6 +531,22 @@ public class SyntacticsequencertestSwitch extends Switch return null; } + /** + * Returns the result of interpreting the object as an instance of 'Bug398890'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Bug398890'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBug398890(Bug398890 object) + { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Add0'. * 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 245ea631d..7fb7f1bf6 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 @@ -761,7 +761,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElemen private final RuleCall cAbstractTerminalParserRuleCall_0_1 = (RuleCall)cAlternatives_0.eContents().get(1); private final RuleCall cCardinalitiesParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - /// * SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory * / AbstractTokenWithCardinality + ///* SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory */ AbstractTokenWithCardinality //AbstractElement: // (Assignment | AbstractTerminal) Cardinalities? @Override public ParserRule getRule() { return rule; } @@ -1622,7 +1622,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElemen private final RuleCall cTerminalTokenElementParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); private final RuleCall cCardinalitiesParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - /// * SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory * / TerminalToken AbstractElement: + ///* SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory */ TerminalToken AbstractElement: // TerminalTokenElement Cardinalities? @Override public ParserRule getRule() { return rule; } @@ -2284,7 +2284,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElemen return getAbstractTokenAccess().getRule(); } - /// * SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory * / AbstractTokenWithCardinality + ///* SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory */ AbstractTokenWithCardinality //AbstractElement: // (Assignment | AbstractTerminal) Cardinalities? public AbstractTokenWithCardinalityElements getAbstractTokenWithCardinalityAccess() { @@ -2537,7 +2537,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElemen return getTerminalGroupAccess().getRule(); } - /// * SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory * / TerminalToken AbstractElement: + ///* SuppressWarnings[potentialOverride]: Handled in CardinalityAwareEcoreFactory */ TerminalToken AbstractElement: // TerminalTokenElement Cardinalities? public TerminalTokenElements getTerminalTokenAccess() { return pTerminalToken; @@ -2679,7 +2679,7 @@ public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElemen } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 68cb85996..b1e8e0e5f 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 @@ -159,7 +159,7 @@ public class ActionTestLanguage2GrammarAccess extends AbstractGrammarElementFind } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java index 1f0b65550..08fa2fd7f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java @@ -152,7 +152,7 @@ public class ActionTestLanguageGrammarAccess extends AbstractGrammarElementFinde } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java index fb8c82c0a..260a49e77 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java @@ -36,7 +36,7 @@ public class FowlerDslTestLanguageGrammarAccess extends AbstractGrammarElementFi private final Assignment cStatesAssignment_6 = (Assignment)cGroup.eContents().get(6); private final RuleCall cStatesStateParserRuleCall_6_0 = (RuleCall)cStatesAssignment_6.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / Statemachine: + ///* SuppressWarnings[noInstantiation] */ Statemachine: // 'events' // events+=Event* // 'end' @@ -296,7 +296,7 @@ public class FowlerDslTestLanguageGrammarAccess extends AbstractGrammarElementFi } - /// * SuppressWarnings[noInstantiation] * / Statemachine: + ///* SuppressWarnings[noInstantiation] */ Statemachine: // 'events' // events+=Event* // 'end' @@ -374,7 +374,7 @@ public class FowlerDslTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java index 044c6e22a..1de243475 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java @@ -364,7 +364,7 @@ public class LookaheadTestLanguageGrammarAccess extends AbstractGrammarElementFi } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java index 6a20f1540..56a717f6b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java @@ -144,7 +144,7 @@ public class OptionalEmptyTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java index ca29d86d1..cb99b3ab9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java @@ -564,7 +564,7 @@ public class PartialParserTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java index 867ecc9a6..da92e4851 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java @@ -515,7 +515,7 @@ public class ReferenceGrammarTestLanguageGrammarAccess extends AbstractGrammarEl } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 cc7ebf4c9..ad566b886 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 @@ -338,7 +338,7 @@ public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractGrammarE } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } 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 ec6342431..5270e0aa3 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 @@ -259,7 +259,7 @@ public class TestLanguageGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java index d303ab077..cbeed7aa3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java @@ -176,7 +176,7 @@ public class TreeTestLanguageGrammarAccess extends AbstractGrammarElementFinder } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java index 33944e7f5..acd0e85af 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java @@ -1038,7 +1038,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cVal3Assignment_1_2 = (Assignment)cAlternatives_1.eContents().get(2); private final RuleCall cVal3STRINGTerminalRuleCall_1_2_0 = (RuleCall)cVal3Assignment_1_2.eContents().get(0); - /// * SuppressWarnings[noInstantiation, potentialOverride] * / Combination3: + ///* SuppressWarnings[noInstantiation, potentialOverride] */ Combination3: // "#15" (val1=ID | val2=INT | val3=STRING)*; @Override public ParserRule getRule() { return rule; } @@ -1167,7 +1167,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cVal1Assignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1); private final RuleCall cVal1IDTerminalRuleCall_1_1_1_0 = (RuleCall)cVal1Assignment_1_1_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / List2: + ///* SuppressWarnings[noInstantiation] */ List2: // "#18" (val1+=ID ("," val1+=ID)*)?; @Override public ParserRule getRule() { return rule; } @@ -1555,7 +1555,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cNestedAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); private final RuleCall cNestedTransientObjectSubParserRuleCall_1_1_0 = (RuleCall)cNestedAssignment_1_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / TransientObject: + ///* SuppressWarnings[noInstantiation] */ TransientObject: // "#24" (val1=ID nested=TransientObjectSub)?; @Override public ParserRule getRule() { return rule; } @@ -1622,7 +1622,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cInt1Assignment_2_1 = (Assignment)cGroup_2.eContents().get(1); private final RuleCall cInt1INTTerminalRuleCall_2_1_0 = (RuleCall)cInt1Assignment_2_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / TransientSerializeables1: + ///* SuppressWarnings[noInstantiation] */ TransientSerializeables1: // "#25" (val1=ID enum1=TransientSerializeables1Enum)? (val2=ID int1=INT)?; @Override public ParserRule getRule() { return rule; } @@ -1682,7 +1682,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cVal3Assignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1); private final RuleCall cVal3IDTerminalRuleCall_3_1_1_0 = (RuleCall)cVal3Assignment_3_1_1.eContents().get(0); - /// * SuppressWarnings[noInstantiation, potentialOverride] * / StaticSimplification: + ///* SuppressWarnings[noInstantiation, potentialOverride] */ StaticSimplification: // "#26" ("kw1" | {EmptyAlternativeSub} | val1=ID) ("kw2" | val2=ID) ("kw3" ("kw4" val3=ID+)?); @Override public ParserRule getRule() { return rule; } @@ -1954,7 +1954,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG private final Assignment cCAssignment_3_2 = (Assignment)cGroup_3.eContents().get(2); private final RuleCall cCIDTerminalRuleCall_3_2_0 = (RuleCall)cCAssignment_3_2.eContents().get(0); - /// * SuppressWarnings[noInstantiation] * / Heuristic1: + ///* SuppressWarnings[noInstantiation] */ Heuristic1: // "#28" ("kw1" a+=ID b+=ID)* ("kw2" a+=ID c+=ID)* ("kw3" b+=ID c+=ID)*; @Override public ParserRule getRule() { return rule; } @@ -2331,7 +2331,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getCombination2Access().getRule(); } - /// * SuppressWarnings[noInstantiation, potentialOverride] * / Combination3: + ///* SuppressWarnings[noInstantiation, potentialOverride] */ Combination3: // "#15" (val1=ID | val2=INT | val3=STRING)*; public Combination3Elements getCombination3Access() { return pCombination3; @@ -2361,7 +2361,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getList1Access().getRule(); } - /// * SuppressWarnings[noInstantiation] * / List2: + ///* SuppressWarnings[noInstantiation] */ List2: // "#18" (val1+=ID ("," val1+=ID)*)?; public List2Elements getList2Access() { return pList2; @@ -2421,7 +2421,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getAltList2Access().getRule(); } - /// * SuppressWarnings[noInstantiation] * / TransientObject: + ///* SuppressWarnings[noInstantiation] */ TransientObject: // "#24" (val1=ID nested=TransientObjectSub)?; public TransientObjectElements getTransientObjectAccess() { return pTransientObject; @@ -2441,7 +2441,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getTransientObjectSubAccess().getRule(); } - /// * SuppressWarnings[noInstantiation] * / TransientSerializeables1: + ///* SuppressWarnings[noInstantiation] */ TransientSerializeables1: // "#25" (val1=ID enum1=TransientSerializeables1Enum)? (val2=ID int1=INT)?; public TransientSerializeables1Elements getTransientSerializeables1Access() { return pTransientSerializeables1; @@ -2461,7 +2461,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getTransientSerializeables1EnumAccess().getRule(); } - /// * SuppressWarnings[noInstantiation, potentialOverride] * / StaticSimplification: + ///* SuppressWarnings[noInstantiation, potentialOverride] */ StaticSimplification: // "#26" ("kw1" | {EmptyAlternativeSub} | val1=ID) ("kw2" | val2=ID) ("kw3" ("kw4" val3=ID+)?); public StaticSimplificationElements getStaticSimplificationAccess() { return pStaticSimplification; @@ -2502,7 +2502,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG return getTwoVersionNo2Access().getRule(); } - /// * SuppressWarnings[noInstantiation] * / Heuristic1: + ///* SuppressWarnings[noInstantiation] */ Heuristic1: // "#28" ("kw1" a+=ID b+=ID)* ("kw2" a+=ID c+=ID)* ("kw3" b+=ID c+=ID)*; public Heuristic1Elements getHeuristic1Access() { return pHeuristic1; @@ -2532,7 +2532,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java index 24fb43318..bdb29db8f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java @@ -491,7 +491,7 @@ public class Bug250313GrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java index ec250e0cc..d47e88d05 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java @@ -168,7 +168,7 @@ public class QualifiedNameTestLanguageGrammarAccess extends AbstractGrammarEleme } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java index 2c4bbc5c3..151addcd0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java @@ -107,7 +107,7 @@ public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarE } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java index 766d67186..59c85cd20 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java @@ -203,7 +203,7 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext index 32176b61b..0345b39a9 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtext @@ -13,7 +13,7 @@ generate syntacticsequencertest "http://www.eclipse.org/2009/tmf/xtext/syntactic Model: x1=MandatoryKeywords | x2=Exp0 | x3=Exp1 | x4=Exp2 | x5=SingleCrossReference | x6=BooleanAlternative | x7=UnassignedDatatype | x8=OptionalSingleTransition | x9=OptionalManyTransition | x10=MandatoryManyTransition | - x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller; + x11=AlternativeTransition | x12=BooleanValues | x13=LongAlternative | x14=ActionOnly | x15=FragmentCaller | x16=Bug398890; MandatoryKeywords: "#1" val1=ID "kw1" val2=ID "kw2" "kw3" val3=ID "kw4"; @@ -113,4 +113,10 @@ FragmentCaller returns FragmentCallerType: "#15" val1=ID Fragment1 val=ID; fragment Fragment1 returns FragmentCallerType: - fragVal=ID; \ No newline at end of file + fragVal=ID; + +Bug398890: + C_COMMENT_END name=ID +; + +terminal C_COMMENT_END: '*/'; \ No newline at end of file diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend index a839dc0fc..e2b78bd2f 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend @@ -400,7 +400,7 @@ class GrammarAccessExtensions { } catch (Exception e) { s = e.toString } - s = prefix + s.trim.replaceAll('(\\r?\\n)', '$1' + prefix).replaceAll('/\\*', '/ *').replaceAll('\\*/', '* /').replace("\\u", "\\\\u") + s = prefix + s.trim.replaceAll('(\\r?\\n)', '$1' + prefix).replace("\\u", "\\\\u") return s } diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend index 498fce5de..8c8ec81de 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.xtend @@ -534,7 +534,7 @@ import org.eclipse.xtext.util.internal.Log } return ''' /** - * «NodeModelUtils.getNode(rule).textWithoutComments.trim.replace('\n', '\n* ')» + * «NodeModelUtils.getNode(rule).textWithoutComments.trim.replace('\n', '\n* ').replace('*/','*/')» */ protected String «rule.unassignedCalledTokenRuleName»(«EObject» semanticObject, «RuleCall» ruleCall, «INode» node) { if (node != null) diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java index 6d085c33f..8320c08f4 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.java @@ -655,9 +655,7 @@ public class GrammarAccessExtensions { } String _trim = s.trim(); String _replaceAll = _trim.replaceAll("(\\r?\\n)", ("$1" + prefix)); - String _replaceAll_1 = _replaceAll.replaceAll("/\\*", "/ *"); - String _replaceAll_2 = _replaceAll_1.replaceAll("\\*/", "* /"); - String _replace = _replaceAll_2.replace("\\u", "\\\\u"); + String _replace = _replaceAll.replace("\\u", "\\\\u"); String _plus = (prefix + _replace); s = _plus; return s; diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.java index 390d90e64..9c19151ad 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/serializer/SerializerFragment2.java @@ -1725,7 +1725,8 @@ public class SerializerFragment2 extends AbstractStubGeneratingFragment { String _textWithoutComments = SerializerFragment2.this.textWithoutComments(_node); String _trim = _textWithoutComments.trim(); String _replace = _trim.replace("\n", "\n* "); - _builder.append(_replace, " "); + String _replace_1 = _replace.replace("*/", "*/"); + _builder.append(_replace_1, " "); _builder.newLineIfNotEmpty(); _builder.append(" "); _builder.append("*/");