diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeModule.java index d4fee5f00..fe6297b92 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeModule.java @@ -77,7 +77,7 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalXtextGrammarTestLanguageLexer() { + public Provider provideInternalXtextGrammarTestLanguageLexer() { return LexerProvider.create(InternalXtextGrammarTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeModule.java index c3ac17bff..d2b91aa43 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractDummyTestLanguageRuntimeModule extends DefaultRunt } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalDummyTestLanguageLexer() { + public Provider provideInternalDummyTestLanguageLexer() { return LexerProvider.create(InternalDummyTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumAndReferenceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumAndReferenceTestLanguageRuntimeModule.java index 37338a3fc..686b31488 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumAndReferenceTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumAndReferenceTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEnumAndReferenceTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEnumAndReferenceTestLanguageLexer() { + public Provider provideInternalEnumAndReferenceTestLanguageLexer() { return LexerProvider.create(InternalEnumAndReferenceTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageRuntimeModule.java index c60cb88a6..12f8a53c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEnumRulesTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEnumRulesTestLanguageLexer() { + public Provider provideInternalEnumRulesTestLanguageLexer() { return LexerProvider.create(InternalEnumRulesTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractMultiRuleEnumTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractMultiRuleEnumTestLanguageRuntimeModule.java index ab9c5dcb5..615db8292 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractMultiRuleEnumTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/AbstractMultiRuleEnumTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractMultiRuleEnumTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalMultiRuleEnumTestLanguageLexer() { + public Provider provideInternalMultiRuleEnumTestLanguageLexer() { return LexerProvider.create(InternalMultiRuleEnumTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/AbstractFormatterTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/AbstractFormatterTestLanguageRuntimeModule.java index 785eeffa5..f208cb527 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/AbstractFormatterTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/AbstractFormatterTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractFormatterTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalFormatterTestLanguageLexer() { + public Provider provideInternalFormatterTestLanguageLexer() { return LexerProvider.create(InternalFormatterTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccessTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccessTestLanguageRuntimeModule.java index 8226a8807..b8df3c8f8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccessTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/AbstractRegionAccessTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractRegionAccessTestLanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalRegionAccessTestLanguageLexer() { + public Provider provideInternalRegionAccessTestLanguageLexer() { return LexerProvider.create(InternalRegionAccessTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractEcoreFragmentTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractEcoreFragmentTestLanguageRuntimeModule.java index 62b618175..5aa8afc08 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractEcoreFragmentTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractEcoreFragmentTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEcoreFragmentTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEcoreFragmentTestLanguageLexer() { + public Provider provideInternalEcoreFragmentTestLanguageLexer() { return LexerProvider.create(InternalEcoreFragmentTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java index 1c528352d..b5fed7068 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSubTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractSubTestLanguageRuntimeModule extends DefaultRuntim } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSubTestLanguageLexer() { + public Provider provideInternalSubTestLanguageLexer() { return LexerProvider.create(InternalSubTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java index 3db2e7fe5..341252ef4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/AbstractSuperTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractSuperTestLanguageRuntimeModule extends DefaultRunt } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSuperTestLanguageLexer() { + public Provider provideInternalSuperTestLanguageLexer() { return LexerProvider.create(InternalSuperTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/AbstractGrammarAccessTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/AbstractGrammarAccessTestLanguageRuntimeModule.java index 636e0ab88..03f92b619 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/AbstractGrammarAccessTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/AbstractGrammarAccessTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractGrammarAccessTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalGrammarAccessTestLanguageLexer() { + public Provider provideInternalGrammarAccessTestLanguageLexer() { return LexerProvider.create(InternalGrammarAccessTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeModule.java index 299faf6c5..1d883a874 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractAbstractTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractAbstractTestLanguageRuntimeModule extends DefaultR } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalAbstractTestLanguageLexer() { + public Provider provideInternalAbstractTestLanguageLexer() { return LexerProvider.create(InternalAbstractTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractBaseInheritanceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractBaseInheritanceTestLanguageRuntimeModule.java index 8fbb43439..1cbf740ff 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractBaseInheritanceTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractBaseInheritanceTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBaseInheritanceTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBaseInheritanceTestLanguageLexer() { + public Provider provideInternalBaseInheritanceTestLanguageLexer() { return LexerProvider.create(InternalBaseInheritanceTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeModule.java index 9ae3bbc35..409a5d259 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractConcreteTestLanguageRuntimeModule extends DefaultR } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalConcreteTestLanguageLexer() { + public Provider provideInternalConcreteTestLanguageLexer() { return LexerProvider.create(InternalConcreteTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest2LanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest2LanguageRuntimeModule.java index 8c7e7857b..c9737603a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest2LanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest2LanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractInheritanceTest2LanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalInheritanceTest2LanguageLexer() { + public Provider provideInternalInheritanceTest2LanguageLexer() { return LexerProvider.create(InternalInheritanceTest2LanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest3LanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest3LanguageRuntimeModule.java index 843316c4f..6a90e53f6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest3LanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTest3LanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractInheritanceTest3LanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalInheritanceTest3LanguageLexer() { + public Provider provideInternalInheritanceTest3LanguageLexer() { return LexerProvider.create(InternalInheritanceTest3LanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTestLanguageRuntimeModule.java index 690ec40cb..a5b8673d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractInheritanceTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractInheritanceTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalInheritanceTestLanguageLexer() { + public Provider provideInternalInheritanceTestLanguageLexer() { return LexerProvider.create(InternalInheritanceTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/AbstractIndexTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/AbstractIndexTestLanguageRuntimeModule.java index 8760646f2..8405084bc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/AbstractIndexTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/AbstractIndexTestLanguageRuntimeModule.java @@ -86,7 +86,7 @@ public abstract class AbstractIndexTestLanguageRuntimeModule extends DefaultRunt } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIndexTestLanguageLexer() { + public Provider provideInternalIndexTestLanguageLexer() { return LexerProvider.create(InternalIndexTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java index d9392ea5f..ec399fc35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractBacktrackingLexerTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBacktrackingLexerTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBacktrackingLexerTestLanguageLexer() { + public Provider provideInternalBacktrackingLexerTestLanguageLexer() { return LexerProvider.create(InternalBacktrackingLexerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractIgnoreCaseLexerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractIgnoreCaseLexerTestLanguageRuntimeModule.java index 0105c06ee..0bb9e220f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractIgnoreCaseLexerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/AbstractIgnoreCaseLexerTestLanguageRuntimeModule.java @@ -84,7 +84,7 @@ public abstract class AbstractIgnoreCaseLexerTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIgnoreCaseLexerTestLanguageLexer() { + public Provider provideInternalIgnoreCaseLexerTestLanguageLexer() { return LexerProvider.create(InternalIgnoreCaseLexerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractAbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractAbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java index 977b28899..c573371bb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractAbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractAbstractIgnoreCaseLinkingTestLanguageRuntimeModule.java @@ -86,7 +86,7 @@ public abstract class AbstractAbstractIgnoreCaseLinkingTestLanguageRuntimeModule } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalAbstractIgnoreCaseLinkingTestLanguageLexer() { + public Provider provideInternalAbstractIgnoreCaseLinkingTestLanguageLexer() { return LexerProvider.create(InternalAbstractIgnoreCaseLinkingTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug287988TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug287988TestLanguageRuntimeModule.java index 1820fee6a..a7f1c1ad7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug287988TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug287988TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug287988TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug287988TestLanguageLexer() { + public Provider provideInternalBug287988TestLanguageLexer() { return LexerProvider.create(InternalBug287988TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug289059TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug289059TestLanguageRuntimeModule.java index 674a22e54..126a98baf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug289059TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug289059TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug289059TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug289059TestLanguageLexer() { + public Provider provideInternalBug289059TestLanguageLexer() { return LexerProvider.create(InternalBug289059TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug313089TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug313089TestLanguageRuntimeModule.java index 2882d77f8..8bce1d944 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug313089TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug313089TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug313089TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug313089TestLanguageLexer() { + public Provider provideInternalBug313089TestLanguageLexer() { return LexerProvider.create(InternalBug313089TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug362902RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug362902RuntimeModule.java index a01938bb5..b2a6c5dfd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug362902RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractBug362902RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug362902RuntimeModule extends DefaultRuntimeModul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug362902Lexer() { + public Provider provideInternalBug362902Lexer() { return LexerProvider.create(InternalBug362902Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseImportsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseImportsTestLanguageRuntimeModule.java index c9bebe950..7ff2faa9b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseImportsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseImportsTestLanguageRuntimeModule.java @@ -86,7 +86,7 @@ public abstract class AbstractIgnoreCaseImportsTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIgnoreCaseImportsTestLanguageLexer() { + public Provider provideInternalIgnoreCaseImportsTestLanguageLexer() { return LexerProvider.create(InternalIgnoreCaseImportsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseNamespacesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseNamespacesTestLanguageRuntimeModule.java index 110f4a4bd..eb7ffdee3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseNamespacesTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseNamespacesTestLanguageRuntimeModule.java @@ -86,7 +86,7 @@ public abstract class AbstractIgnoreCaseNamespacesTestLanguageRuntimeModule exte } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIgnoreCaseNamespacesTestLanguageLexer() { + public Provider provideInternalIgnoreCaseNamespacesTestLanguageLexer() { return LexerProvider.create(InternalIgnoreCaseNamespacesTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractImportUriTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractImportUriTestLanguageRuntimeModule.java index b29ba6dea..14f50a1b5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractImportUriTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractImportUriTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractImportUriTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalImportUriTestLanguageLexer() { + public Provider provideInternalImportUriTestLanguageLexer() { return LexerProvider.create(InternalImportUriTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractLangATestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractLangATestLanguageRuntimeModule.java index 4a70a3a03..b3e7842d2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractLangATestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractLangATestLanguageRuntimeModule.java @@ -86,7 +86,7 @@ public abstract class AbstractLangATestLanguageRuntimeModule extends DefaultRunt } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLangATestLanguageLexer() { + public Provider provideInternalLangATestLanguageLexer() { return LexerProvider.create(InternalLangATestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractBug311337TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractBug311337TestLanguageRuntimeModule.java index 287286dfb..7040353be 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractBug311337TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractBug311337TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug311337TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug311337TestLanguageLexer() { + public Provider provideInternalBug311337TestLanguageLexer() { return LexerProvider.create(InternalBug311337TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractLazyLinkingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractLazyLinkingTestLanguageRuntimeModule.java index 715ecdfc4..b6199c26e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractLazyLinkingTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/AbstractLazyLinkingTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractLazyLinkingTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLazyLinkingTestLanguageLexer() { + public Provider provideInternalLazyLinkingTestLanguageLexer() { return LexerProvider.create(InternalLazyLinkingTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractEcoreReferenceTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractEcoreReferenceTestLanguageRuntimeModule.java index d32eabbd9..6fe03a9a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractEcoreReferenceTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractEcoreReferenceTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEcoreReferenceTestLanguageRuntimeModule extends De } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEcoreReferenceTestLanguageLexer() { + public Provider provideInternalEcoreReferenceTestLanguageLexer() { return LexerProvider.create(InternalEcoreReferenceTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeModule.java index f4ff772fa..d3a2ea1a7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalMetamodelRefTestLanguageLexer() { + public Provider provideInternalMetamodelRefTestLanguageLexer() { return LexerProvider.create(InternalMetamodelRefTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeModule.java index 898e0d009..94632a89c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeModule extends Defaul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalMultiGenMMTestLanguageLexer() { + public Provider provideInternalMultiGenMMTestLanguageLexer() { return LexerProvider.create(InternalMultiGenMMTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289515TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289515TestLanguageRuntimeModule.java index 66386c0a1..d453d479e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289515TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289515TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug289515TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug289515TestLanguageLexer() { + public Provider provideInternalBug289515TestLanguageLexer() { return LexerProvider.create(InternalBug289515TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524ExTestLanguageRuntimeModule.java index 7fef4127c..5f51cbbfd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524ExTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524ExTestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug289524ExTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug289524ExTestLanguageLexer() { + public Provider provideInternalBug289524ExTestLanguageLexer() { return LexerProvider.create(InternalBug289524ExTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524TestLanguageRuntimeModule.java index 55a55c14d..30a242a6d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug289524TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug289524TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug289524TestLanguageLexer() { + public Provider provideInternalBug289524TestLanguageLexer() { return LexerProvider.create(InternalBug289524TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889ExTestLanguageRuntimeModule.java index be7ee6025..ebbc02e63 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889ExTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889ExTestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug296889ExTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug296889ExTestLanguageLexer() { + public Provider provideInternalBug296889ExTestLanguageLexer() { return LexerProvider.create(InternalBug296889ExTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889TestLanguageRuntimeModule.java index d0329d9cf..c6659b359 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug296889TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug296889TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug296889TestLanguageLexer() { + public Provider provideInternalBug296889TestLanguageLexer() { return LexerProvider.create(InternalBug296889TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug299237TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug299237TestLanguageRuntimeModule.java index ff2fee893..8f62cf651 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug299237TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug299237TestLanguageRuntimeModule.java @@ -77,7 +77,7 @@ public abstract class AbstractBug299237TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug299237TestLanguageLexer() { + public Provider provideInternalBug299237TestLanguageLexer() { return LexerProvider.create(InternalBug299237TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935ExTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935ExTestLanguageRuntimeModule.java index f058c73b5..a691837f7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935ExTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935ExTestLanguageRuntimeModule.java @@ -77,7 +77,7 @@ public abstract class AbstractBug301935ExTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug301935ExTestLanguageLexer() { + public Provider provideInternalBug301935ExTestLanguageLexer() { return LexerProvider.create(InternalBug301935ExTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935TestLanguageRuntimeModule.java index 37790a818..639929edc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug301935TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug301935TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug301935TestLanguageLexer() { + public Provider provideInternalBug301935TestLanguageLexer() { return LexerProvider.create(InternalBug301935TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug378967TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug378967TestLanguageRuntimeModule.java index 3e5f92020..45294e1f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug378967TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug378967TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug378967TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug378967TestLanguageLexer() { + public Provider provideInternalBug378967TestLanguageLexer() { return LexerProvider.create(InternalBug378967TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug443221TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug443221TestLanguageRuntimeModule.java index 854f96339..29c8ac292 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug443221TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/AbstractBug443221TestLanguageRuntimeModule.java @@ -72,7 +72,7 @@ public abstract class AbstractBug443221TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug443221TestLanguageLexer() { + public Provider provideInternalBug443221TestLanguageLexer() { return LexerProvider.create(InternalBug443221TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractAssignmentsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractAssignmentsTestLanguageRuntimeModule.java index 68e2c82ef..d1000b20f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractAssignmentsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractAssignmentsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractAssignmentsTestLanguageRuntimeModule extends Defau } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalAssignmentsTestLanguageLexer() { + public Provider provideInternalAssignmentsTestLanguageLexer() { return LexerProvider.create(InternalAssignmentsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug287184TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug287184TestLanguageRuntimeModule.java index 1ee1f7982..f683199e2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug287184TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug287184TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug287184TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug287184TestLanguageLexer() { + public Provider provideInternalBug287184TestLanguageLexer() { return LexerProvider.create(InternalBug287184TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug288432TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug288432TestLanguageRuntimeModule.java index 762a17062..b6b3ce270 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug288432TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AbstractBug288432TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug288432TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug288432TestLanguageLexer() { + public Provider provideInternalBug288432TestLanguageLexer() { return LexerProvider.create(InternalBug288432TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/AbstractBug419429RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/AbstractBug419429RuntimeModule.java index a35860c02..e7a2394b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/AbstractBug419429RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/AbstractBug419429RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug419429RuntimeModule extends DefaultRuntimeModul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug419429Lexer() { + public Provider provideInternalBug419429Lexer() { return LexerProvider.create(InternalBug419429Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeModule.java index f06b284e0..d9d693bbc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalDatatypeRulesTestLanguageLexer() { + public Provider provideInternalDatatypeRulesTestLanguageLexer() { return LexerProvider.create(InternalDatatypeRulesTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java index 1a3dde928..aedaf8460 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEncodingTestLanguageRuntimeModule extends DefaultR } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEncodingTestLanguageLexer() { + public Provider provideInternalEncodingTestLanguageLexer() { return LexerProvider.create(InternalEncodingTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/AbstractEpatchTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/AbstractEpatchTestLanguageRuntimeModule.java index a1e5d8fcc..1fde0296b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/AbstractEpatchTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/AbstractEpatchTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEpatchTestLanguageRuntimeModule extends DefaultRun } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEpatchTestLanguageLexer() { + public Provider provideInternalEpatchTestLanguageLexer() { return LexerProvider.create(InternalEpatchTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageExRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageExRuntimeModule.java index 8c835538a..21f876ddc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageExRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageExRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractFragmentTestLanguageExRuntimeModule extends Defaul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalFragmentTestLanguageExLexer() { + public Provider provideInternalFragmentTestLanguageExLexer() { return LexerProvider.create(InternalFragmentTestLanguageExLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageRuntimeModule.java index c814343ff..d19f3a8c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/AbstractFragmentTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractFragmentTestLanguageRuntimeModule extends DefaultR } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalFragmentTestLanguageLexer() { + public Provider provideInternalFragmentTestLanguageLexer() { return LexerProvider.create(InternalFragmentTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/AbstractIndentationAwareTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/AbstractIndentationAwareTestLanguageRuntimeModule.java index 095b0cf1f..8f4a2e573 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/AbstractIndentationAwareTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/AbstractIndentationAwareTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractIndentationAwareTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIndentationAwareTestLanguageLexer() { + public Provider provideInternalIndentationAwareTestLanguageLexer() { return LexerProvider.create(InternalIndentationAwareTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageRuntimeModule.java index daaf89685..71f312643 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/AbstractKeywordsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractKeywordsTestLanguageRuntimeModule extends DefaultR } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalKeywordsTestLanguageLexer() { + public Provider provideInternalKeywordsTestLanguageLexer() { return LexerProvider.create(InternalKeywordsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractNoParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractNoParametersTestLanguageRuntimeModule.java index 5da859f30..1131e1a43 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractNoParametersTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractNoParametersTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractNoParametersTestLanguageRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalNoParametersTestLanguageLexer() { + public Provider provideInternalNoParametersTestLanguageLexer() { return LexerProvider.create(InternalNoParametersTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageExRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageExRuntimeModule.java index 9594eca1a..a3cf7c457 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageExRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageExRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractParametersTestLanguageExRuntimeModule extends Defa } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalParametersTestLanguageExLexer() { + public Provider provideInternalParametersTestLanguageExLexer() { return LexerProvider.create(InternalParametersTestLanguageExLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageRuntimeModule.java index a0db1f06a..5fd956e88 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractParametersTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractParametersTestLanguageRuntimeModule extends Defaul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalParametersTestLanguageLexer() { + public Provider provideInternalParametersTestLanguageLexer() { return LexerProvider.create(InternalParametersTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractTwoParametersTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractTwoParametersTestLanguageRuntimeModule.java index 958e53a77..8ab21cee4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractTwoParametersTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/AbstractTwoParametersTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractTwoParametersTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalTwoParametersTestLanguageLexer() { + public Provider provideInternalTwoParametersTestLanguageLexer() { return LexerProvider.create(InternalTwoParametersTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug292245TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug292245TestLanguageRuntimeModule.java index 85df09cf5..b94473c02 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug292245TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug292245TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug292245TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug292245TestLanguageLexer() { + public Provider provideInternalBug292245TestLanguageLexer() { return LexerProvider.create(InternalBug292245TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug297105TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug297105TestLanguageRuntimeModule.java index 54cca6c42..249f1182d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug297105TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug297105TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug297105TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug297105TestLanguageLexer() { + public Provider provideInternalBug297105TestLanguageLexer() { return LexerProvider.create(InternalBug297105TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug317840TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug317840TestLanguageRuntimeModule.java index 624817baf..f057612ab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug317840TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractBug317840TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug317840TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug317840TestLanguageLexer() { + public Provider provideInternalBug317840TestLanguageLexer() { return LexerProvider.create(InternalBug317840TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractEcoreTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractEcoreTerminalsTestLanguageRuntimeModule.java index ef692aea3..0f15017b8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractEcoreTerminalsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractEcoreTerminalsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEcoreTerminalsTestLanguageRuntimeModule extends De } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEcoreTerminalsTestLanguageLexer() { + public Provider provideInternalEcoreTerminalsTestLanguageLexer() { return LexerProvider.create(InternalEcoreTerminalsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractHiddenTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractHiddenTerminalsTestLanguageRuntimeModule.java index bc743a446..bf81b7dfb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractHiddenTerminalsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractHiddenTerminalsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractHiddenTerminalsTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalHiddenTerminalsTestLanguageLexer() { + public Provider provideInternalHiddenTerminalsTestLanguageLexer() { return LexerProvider.create(InternalHiddenTerminalsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeModule.java index d937ee20d..ab0e96631 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalTerminalRulesTestLanguageLexer() { + public Provider provideInternalTerminalRulesTestLanguageLexer() { return LexerProvider.create(InternalTerminalRulesTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractUnicodeTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractUnicodeTestLanguageRuntimeModule.java index 8e97653e9..36783936b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractUnicodeTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractUnicodeTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractUnicodeTestLanguageRuntimeModule extends DefaultRu } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalUnicodeTestLanguageLexer() { + public Provider provideInternalUnicodeTestLanguageLexer() { return LexerProvider.create(InternalUnicodeTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeModule.java index 05afa8d89..7b8ff4a95 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeModule extends De } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalXtextTerminalsTestLanguageLexer() { + public Provider provideInternalXtextTerminalsTestLanguageLexer() { return LexerProvider.create(InternalXtextTerminalsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745TestLanguageRuntimeModule.java index 4ddcf73ad..66b8e86b1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractBacktrackingBug325745TestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractBacktrackingBug325745TestLanguageRuntimeModule ext } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBacktrackingBug325745TestLanguageLexer() { + public Provider provideInternalBacktrackingBug325745TestLanguageLexer() { return LexerProvider.create(InternalBacktrackingBug325745TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExBacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExBacktrackingBug325745TestLanguageRuntimeModule.java index b81ddc04a..a1f35eee5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExBacktrackingBug325745TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExBacktrackingBug325745TestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractExBacktrackingBug325745TestLanguageRuntimeModule e } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalExBacktrackingBug325745TestLanguageLexer() { + public Provider provideInternalExBacktrackingBug325745TestLanguageLexer() { return LexerProvider.create(InternalExBacktrackingBug325745TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExUnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExUnorderedGroupsTestLanguageRuntimeModule.java index 1706055a7..0cb53fa8e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExUnorderedGroupsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractExUnorderedGroupsTestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractExUnorderedGroupsTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalExUnorderedGroupsTestLanguageLexer() { + public Provider provideInternalExUnorderedGroupsTestLanguageLexer() { return LexerProvider.create(InternalExUnorderedGroupsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleBacktrackingBug325745TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleBacktrackingBug325745TestLanguageRuntimeModule.java index edcd470ff..ef3c37ac0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleBacktrackingBug325745TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleBacktrackingBug325745TestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractSimpleBacktrackingBug325745TestLanguageRuntimeModu } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSimpleBacktrackingBug325745TestLanguageLexer() { + public Provider provideInternalSimpleBacktrackingBug325745TestLanguageLexer() { return LexerProvider.create(InternalSimpleBacktrackingBug325745TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleUnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleUnorderedGroupsTestLanguageRuntimeModule.java index ef2d415c9..cc3360709 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleUnorderedGroupsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractSimpleUnorderedGroupsTestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractSimpleUnorderedGroupsTestLanguageRuntimeModule ext } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSimpleUnorderedGroupsTestLanguageLexer() { + public Provider provideInternalSimpleUnorderedGroupsTestLanguageLexer() { return LexerProvider.create(InternalSimpleUnorderedGroupsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractUnorderedGroupsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractUnorderedGroupsTestLanguageRuntimeModule.java index e51235796..ad507f5c9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractUnorderedGroupsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/AbstractUnorderedGroupsTestLanguageRuntimeModule.java @@ -81,7 +81,7 @@ public abstract class AbstractUnorderedGroupsTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalUnorderedGroupsTestLanguageLexer() { + public Provider provideInternalUnorderedGroupsTestLanguageLexer() { return LexerProvider.create(InternalUnorderedGroupsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeModule.java index 189d6999d..1cbb80e7b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractFormatterTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalFormatterTestLanguageLexer() { + public Provider provideInternalFormatterTestLanguageLexer() { return LexerProvider.create(InternalFormatterTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractBug305397RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractBug305397RuntimeModule.java index 25c1df792..e1daa42d1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractBug305397RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractBug305397RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug305397RuntimeModule extends DefaultRuntimeModul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug305397Lexer() { + public Provider provideInternalBug305397Lexer() { return LexerProvider.create(InternalBug305397Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractCommentAssociationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractCommentAssociationTestLanguageRuntimeModule.java index e099a22ad..0b7b2480b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractCommentAssociationTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/AbstractCommentAssociationTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractCommentAssociationTestLanguageRuntimeModule extend } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalCommentAssociationTestLanguageLexer() { + public Provider provideInternalCommentAssociationTestLanguageLexer() { return LexerProvider.create(InternalCommentAssociationTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug299395TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug299395TestLanguageRuntimeModule.java index 20c988908..7e96e342a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug299395TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug299395TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug299395TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug299395TestLanguageLexer() { + public Provider provideInternalBug299395TestLanguageLexer() { return LexerProvider.create(InternalBug299395TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug302128TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug302128TestLanguageRuntimeModule.java index bbf8dd2a3..9a39824d1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug302128TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractBug302128TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug302128TestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug302128TestLanguageLexer() { + public Provider provideInternalBug302128TestLanguageLexer() { return LexerProvider.create(InternalBug302128TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeModule.java index a1927adbd..f668aae5e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalComplexReconstrTestLanguageLexer() { + public Provider provideInternalComplexReconstrTestLanguageLexer() { return LexerProvider.create(InternalComplexReconstrTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationBug269362TestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationBug269362TestLanguageRuntimeModule.java index 7044850db..a0a088348 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationBug269362TestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationBug269362TestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractSerializationBug269362TestLanguageRuntimeModule ex } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSerializationBug269362TestLanguageLexer() { + public Provider provideInternalSerializationBug269362TestLanguageLexer() { return LexerProvider.create(InternalSerializationBug269362TestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationErrorTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationErrorTestLanguageRuntimeModule.java index 33dd23f4e..8d718d8a6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationErrorTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSerializationErrorTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractSerializationErrorTestLanguageRuntimeModule extend } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSerializationErrorTestLanguageLexer() { + public Provider provideInternalSerializationErrorTestLanguageLexer() { return LexerProvider.create(InternalSerializationErrorTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeModule.java index 5ab40846a..d58e61b6e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractTransientValuesTestRuntimeModule extends DefaultRu } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalTransientValuesTestLexer() { + public Provider provideInternalTransientValuesTestLexer() { return LexerProvider.create(InternalTransientValuesTestLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/AbstractUnassignedTextTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/AbstractUnassignedTextTestLanguageRuntimeModule.java index 40f4c5675..426960aaa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/AbstractUnassignedTextTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/AbstractUnassignedTextTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractUnassignedTextTestLanguageRuntimeModule extends De } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalUnassignedTextTestLanguageLexer() { + public Provider provideInternalUnassignedTextTestLanguageLexer() { return LexerProvider.create(InternalUnassignedTextTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractBug385636RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractBug385636RuntimeModule.java index 6f1350cd2..b4a3ffe49 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractBug385636RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractBug385636RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug385636RuntimeModule extends DefaultRuntimeModul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug385636Lexer() { + public Provider provideInternalBug385636Lexer() { return LexerProvider.create(InternalBug385636Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractEObjectAtOffsetTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractEObjectAtOffsetTestLanguageRuntimeModule.java index 79e93b3c8..8057220f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractEObjectAtOffsetTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractEObjectAtOffsetTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractEObjectAtOffsetTestLanguageRuntimeModule extends D } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalEObjectAtOffsetTestLanguageLexer() { + public Provider provideInternalEObjectAtOffsetTestLanguageLexer() { return LexerProvider.create(InternalEObjectAtOffsetTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerBuilderIntegerationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerBuilderIntegerationTestLanguageRuntimeModule.java index dfb30eae1..36ffef368 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerBuilderIntegerationTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerBuilderIntegerationTestLanguageRuntimeModule.java @@ -84,7 +84,7 @@ public abstract class AbstractLiveContainerBuilderIntegerationTestLanguageRuntim } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLiveContainerBuilderIntegerationTestLanguageLexer() { + public Provider provideInternalLiveContainerBuilderIntegerationTestLanguageLexer() { return LexerProvider.create(InternalLiveContainerBuilderIntegerationTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerTestLanguageRuntimeModule.java index bc95b3945..dae1cbe47 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLiveContainerTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractLiveContainerTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLiveContainerTestLanguageLexer() { + public Provider provideInternalLiveContainerTestLanguageLexer() { return LexerProvider.create(InternalLiveContainerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLocationProviderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLocationProviderTestLanguageRuntimeModule.java index 667d25e5a..1a580ed84 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLocationProviderTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/AbstractLocationProviderTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractLocationProviderTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLocationProviderTestLanguageLexer() { + public Provider provideInternalLocationProviderTestLanguageLexer() { return LexerProvider.create(InternalLocationProviderTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractAssignmentFinderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractAssignmentFinderTestLanguageRuntimeModule.java index 313d6ddf0..bdffe39ad 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractAssignmentFinderTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractAssignmentFinderTestLanguageRuntimeModule.java @@ -78,7 +78,7 @@ public abstract class AbstractAssignmentFinderTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalAssignmentFinderTestLanguageLexer() { + public Provider provideInternalAssignmentFinderTestLanguageLexer() { return LexerProvider.create(InternalAssignmentFinderTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractContextFinderTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractContextFinderTestLanguageRuntimeModule.java index 1c4c3adb7..c5d94db49 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractContextFinderTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractContextFinderTestLanguageRuntimeModule.java @@ -78,7 +78,7 @@ public abstract class AbstractContextFinderTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalContextFinderTestLanguageLexer() { + public Provider provideInternalContextFinderTestLanguageLexer() { return LexerProvider.create(InternalContextFinderTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractHiddenTokenSequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractHiddenTokenSequencerTestLanguageRuntimeModule.java index d041e0ea3..fc1a6b332 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractHiddenTokenSequencerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractHiddenTokenSequencerTestLanguageRuntimeModule.java @@ -78,7 +78,7 @@ public abstract class AbstractHiddenTokenSequencerTestLanguageRuntimeModule exte } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalHiddenTokenSequencerTestLanguageLexer() { + public Provider provideInternalHiddenTokenSequencerTestLanguageLexer() { return LexerProvider.create(InternalHiddenTokenSequencerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSequencerTestLanguageRuntimeModule.java index 0eaa85e3f..e1ed9ae80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSequencerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSequencerTestLanguageRuntimeModule.java @@ -80,7 +80,7 @@ public abstract class AbstractSequencerTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSequencerTestLanguageLexer() { + public Provider provideInternalSequencerTestLanguageLexer() { return LexerProvider.create(InternalSequencerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSyntacticSequencerTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSyntacticSequencerTestLanguageRuntimeModule.java index bc67b626d..1b412508e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSyntacticSequencerTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AbstractSyntacticSequencerTestLanguageRuntimeModule.java @@ -78,7 +78,7 @@ public abstract class AbstractSyntacticSequencerTestLanguageRuntimeModule extend } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSyntacticSequencerTestLanguageLexer() { + public Provider provideInternalSyntacticSequencerTestLanguageLexer() { return LexerProvider.create(InternalSyntacticSequencerTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguage2RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguage2RuntimeModule.java index 324004849..f93269b04 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguage2RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguage2RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractActionTestLanguage2RuntimeModule extends DefaultRu } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalActionTestLanguage2Lexer() { + public Provider provideInternalActionTestLanguage2Lexer() { return LexerProvider.create(InternalActionTestLanguage2Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeModule.java index 53e6a7503..2c7c68dd1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractActionTestLanguageRuntimeModule extends DefaultRun } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalActionTestLanguageLexer() { + public Provider provideInternalActionTestLanguageLexer() { return LexerProvider.create(InternalActionTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeModule.java index 5c4039e42..32028d74c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalFowlerDslTestLanguageLexer() { + public Provider provideInternalFowlerDslTestLanguageLexer() { return LexerProvider.create(InternalFowlerDslTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeModule.java index b58dcad91..4213114f7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractLookaheadTestLanguageRuntimeModule extends Default } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalLookaheadTestLanguageLexer() { + public Provider provideInternalLookaheadTestLanguageLexer() { return LexerProvider.create(InternalLookaheadTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeModule.java index b017ce720..5492f8580 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalOptionalEmptyTestLanguageLexer() { + public Provider provideInternalOptionalEmptyTestLanguageLexer() { return LexerProvider.create(InternalOptionalEmptyTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeModule.java index e28bb6971..7af8aa07e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractPartialParserTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalPartialParserTestLanguageLexer() { + public Provider provideInternalPartialParserTestLanguageLexer() { return LexerProvider.create(InternalPartialParserTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeModule.java index b52035345..85f7a6f35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalReferenceGrammarTestLanguageLexer() { + public Provider provideInternalReferenceGrammarTestLanguageLexer() { return LexerProvider.create(InternalReferenceGrammarTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeModule.java index 0512cbf79..42265bdc7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalSimpleExpressionsTestLanguageLexer() { + public Provider provideInternalSimpleExpressionsTestLanguageLexer() { return LexerProvider.create(InternalSimpleExpressionsTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeModule.java index 168d21a70..19d43b46f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractTestLanguageRuntimeModule extends DefaultRuntimeMo } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalTestLanguageLexer() { + public Provider provideInternalTestLanguageLexer() { return LexerProvider.create(InternalTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeModule.java index 9211fcfdf..6312af549 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractTreeTestLanguageRuntimeModule extends DefaultRunti } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalTreeTestLanguageLexer() { + public Provider provideInternalTreeTestLanguageLexer() { return LexerProvider.create(InternalTreeTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/AbstractIndentationAwareTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/AbstractIndentationAwareTestLanguageRuntimeModule.java index 5d2a325be..b04792b6e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/AbstractIndentationAwareTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/AbstractIndentationAwareTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractIndentationAwareTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalIndentationAwareTestLanguageLexer() { + public Provider provideInternalIndentationAwareTestLanguageLexer() { return LexerProvider.create(InternalIndentationAwareTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTestLanguageRuntimeModule.java index 933b74012..6c6d6c721 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/AbstractConcreteSyntaxValidationTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractConcreteSyntaxValidationTestLanguageRuntimeModule } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalConcreteSyntaxValidationTestLanguageLexer() { + public Provider provideInternalConcreteSyntaxValidationTestLanguageLexer() { return LexerProvider.create(InternalConcreteSyntaxValidationTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeModule.java index f47fc5851..1bb6e3fc4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractBug250313RuntimeModule extends DefaultRuntimeModul } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalBug250313Lexer() { + public Provider provideInternalBug250313Lexer() { return LexerProvider.create(InternalBug250313Lexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractQualifiedNameTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractQualifiedNameTestLanguageRuntimeModule.java index 915467ce7..37e049ea3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractQualifiedNameTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractQualifiedNameTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractQualifiedNameTestLanguageRuntimeModule extends Def } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalQualifiedNameTestLanguageLexer() { + public Provider provideInternalQualifiedNameTestLanguageLexer() { return LexerProvider.create(InternalQualifiedNameTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.ecore index fbd95538d..20ad9d91a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.ecore @@ -8,7 +8,6 @@ upperBound="-1" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> - diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel index 829ef530b..fcc7fcc40 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel @@ -10,7 +10,6 @@ - diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xtextbin index ca5172894..c147cef6d 100644 Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.xtextbin differ diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Bug250313Package.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Bug250313Package.java index 080cb7fd7..d225af5ca 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Bug250313Package.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Bug250313Package.java @@ -94,15 +94,6 @@ public interface Bug250313Package extends EPackage */ int MODEL__CHILDREN = 2; - /** - * The feature id for the 'Ref' reference. - * - * - * @generated - * @ordered - */ - int MODEL__REF = 3; - /** * The number of structural features of the 'Model' class. * @@ -110,7 +101,7 @@ public interface Bug250313Package extends EPackage * @generated * @ordered */ - int MODEL_FEATURE_COUNT = 4; + int MODEL_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.eclipse.xtext.valueconverter.bug250313.impl.ChildImpl Child}' class. @@ -240,17 +231,6 @@ public interface Bug250313Package extends EPackage */ EReference getModel_Children(); - /** - * Returns the meta object for the reference '{@link org.eclipse.xtext.valueconverter.bug250313.Model#getRef Ref}'. - * - * - * @return the meta object for the reference 'Ref'. - * @see org.eclipse.xtext.valueconverter.bug250313.Model#getRef() - * @see #getModel() - * @generated - */ - EReference getModel_Ref(); - /** * Returns the meta object for class '{@link org.eclipse.xtext.valueconverter.bug250313.Child Child}'. * @@ -349,14 +329,6 @@ public interface Bug250313Package extends EPackage */ EReference MODEL__CHILDREN = eINSTANCE.getModel_Children(); - /** - * The meta object literal for the 'Ref' reference feature. - * - * - * @generated - */ - EReference MODEL__REF = eINSTANCE.getModel_Ref(); - /** * The meta object literal for the '{@link org.eclipse.xtext.valueconverter.bug250313.impl.ChildImpl Child}' class. * diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java index 6165c4514..0aeeed91a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.eclipse.xtext.valueconverter.bug250313.Model#getValue Value}
  • *
  • {@link org.eclipse.xtext.valueconverter.bug250313.Model#getMultiValue Multi Value}
  • *
  • {@link org.eclipse.xtext.valueconverter.bug250313.Model#getChildren Children}
  • - *
  • {@link org.eclipse.xtext.valueconverter.bug250313.Model#getRef Ref}
  • * * * @see org.eclipse.xtext.valueconverter.bug250313.Bug250313Package#getModel() @@ -96,30 +95,4 @@ public interface Model extends EObject */ void setChildren(Child value); - /** - * Returns the value of the 'Ref' reference. - * - *

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

    - * - * @return the value of the 'Ref' reference. - * @see #setRef(Child) - * @see org.eclipse.xtext.valueconverter.bug250313.Bug250313Package#getModel_Ref() - * @model - * @generated - */ - Child getRef(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.valueconverter.bug250313.Model#getRef Ref}' reference. - * - * - * @param value the new value of the 'Ref' reference. - * @see #getRef() - * @generated - */ - void setRef(Child value); - } // Model diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java index bab3af742..e62178fa1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java @@ -160,16 +160,6 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa return (EReference)modelEClass.getEStructuralFeatures().get(2); } - /** - * - * - * @generated - */ - public EReference getModel_Ref() - { - return (EReference)modelEClass.getEStructuralFeatures().get(3); - } - /** * * @@ -244,7 +234,6 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa createEAttribute(modelEClass, MODEL__VALUE); createEAttribute(modelEClass, MODEL__MULTI_VALUE); createEReference(modelEClass, MODEL__CHILDREN); - createEReference(modelEClass, MODEL__REF); childEClass = createEClass(CHILD); createEAttribute(childEClass, CHILD__NAME); @@ -294,7 +283,6 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa initEAttribute(getModel_Value(), theEcorePackage.getEString(), "value", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getModel_MultiValue(), theEcorePackage.getEString(), "multiValue", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getModel_Children(), this.getChild(), null, "children", 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_Ref(), this.getChild(), null, "ref", 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(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getChild_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java index 9e402eac9..d6c5334a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java @@ -33,7 +33,6 @@ import org.eclipse.xtext.valueconverter.bug250313.Model; *
  • {@link org.eclipse.xtext.valueconverter.bug250313.impl.ModelImpl#getValue Value}
  • *
  • {@link org.eclipse.xtext.valueconverter.bug250313.impl.ModelImpl#getMultiValue Multi Value}
  • *
  • {@link org.eclipse.xtext.valueconverter.bug250313.impl.ModelImpl#getChildren Children}
  • - *
  • {@link org.eclipse.xtext.valueconverter.bug250313.impl.ModelImpl#getRef Ref}
  • * * * @generated @@ -80,16 +79,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model */ protected Child children; - /** - * The cached value of the '{@link #getRef() Ref}' reference. - * - * - * @see #getRef() - * @generated - * @ordered - */ - protected Child ref; - /** * * @@ -196,49 +185,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model eNotify(new ENotificationImpl(this, Notification.SET, Bug250313Package.MODEL__CHILDREN, newChildren, newChildren)); } - /** - * - * - * @generated - */ - public Child getRef() - { - if (ref != null && ref.eIsProxy()) - { - InternalEObject oldRef = (InternalEObject)ref; - ref = (Child)eResolveProxy(oldRef); - if (ref != oldRef) - { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Bug250313Package.MODEL__REF, oldRef, ref)); - } - } - return ref; - } - - /** - * - * - * @generated - */ - public Child basicGetRef() - { - return ref; - } - - /** - * - * - * @generated - */ - public void setRef(Child newRef) - { - Child oldRef = ref; - ref = newRef; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Bug250313Package.MODEL__REF, oldRef, ref)); - } - /** * * @@ -271,9 +217,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return getMultiValue(); case Bug250313Package.MODEL__CHILDREN: return getChildren(); - case Bug250313Package.MODEL__REF: - if (resolve) return getRef(); - return basicGetRef(); } return super.eGet(featureID, resolve, coreType); } @@ -299,9 +242,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model case Bug250313Package.MODEL__CHILDREN: setChildren((Child)newValue); return; - case Bug250313Package.MODEL__REF: - setRef((Child)newValue); - return; } super.eSet(featureID, newValue); } @@ -325,9 +265,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model case Bug250313Package.MODEL__CHILDREN: setChildren((Child)null); return; - case Bug250313Package.MODEL__REF: - setRef((Child)null); - return; } super.eUnset(featureID); } @@ -348,8 +285,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return multiValue != null && !multiValue.isEmpty(); case Bug250313Package.MODEL__CHILDREN: return children != null; - case Bug250313Package.MODEL__REF: - return ref != null; } return super.eIsSet(featureID); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g index c20807d6a..ba6222e00 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.g @@ -403,62 +403,29 @@ ruleModel returns [EObject current=null] ) | ( + otherlv_16='content' + { + newLeafNode(otherlv_16, grammarAccess.getModelAccess().getContentKeyword_8_0()); + } ( - otherlv_16='content' - { - newLeafNode(otherlv_16, grammarAccess.getModelAccess().getContentKeyword_8_0_0()); - } ( - ( - { - newCompositeNode(grammarAccess.getModelAccess().getChildrenChildParserRuleCall_8_0_1_0()); + { + newCompositeNode(grammarAccess.getModelAccess().getChildrenChildParserRuleCall_8_1_0()); + } + lv_children_17_0=ruleChild + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getModelRule()); } - lv_children_17_0=ruleChild - { - if ($current==null) { - $current = createModelElementForParent(grammarAccess.getModelRule()); - } - set( - $current, - "children", - lv_children_17_0, - "org.eclipse.xtext.valueconverter.Bug250313.Child"); - afterParserOrEnumRuleCall(); - } - ) + set( + $current, + "children", + lv_children_17_0, + "org.eclipse.xtext.valueconverter.Bug250313.Child"); + afterParserOrEnumRuleCall(); + } ) ) - ( - otherlv_18='ref' - { - newLeafNode(otherlv_18, grammarAccess.getModelAccess().getRefKeyword_8_1_0()); - } - ( - ( - ( - { - if ($current==null) { - $current = createModelElement(grammarAccess.getModelRule()); - } - } - otherlv_19=RULE_STRING - { - newLeafNode(otherlv_19, grammarAccess.getModelAccess().getRefChild1CrossReference_8_1_1_0_0()); - } - | - { - if ($current==null) { - $current = createModelElement(grammarAccess.getModelRule()); - } - } - otherlv_19=RULE_ID - { - newLeafNode(otherlv_19, grammarAccess.getModelAccess().getRefChild2CrossReference_8_1_1_0_1()); - } - ) - ) - ) - )? ) ) ; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.tokens b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.tokens index 2583fdb72..80aff56c1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.tokens +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313.tokens @@ -1,5 +1,5 @@ -'+'=23 -'-'=22 +'+'=22 +'-'=21 '1'=11 '1+'=13 '2'=14 @@ -10,7 +10,6 @@ '4+'=19 'content'=20 'mykeyword1'=12 -'ref'=21 RULE_ANY_OTHER=10 RULE_ID=5 RULE_INT=6 @@ -30,4 +29,3 @@ T__19=19 T__20=20 T__21=21 T__22=22 -T__23=23 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java index 5961c0ec5..ff7376b5d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Lexer.java @@ -30,7 +30,6 @@ public class InternalBug250313Lexer extends Lexer { public static final int RULE_INT=6; public static final int T__22=22; public static final int RULE_ML_COMMENT=7; - public static final int T__23=23; public static final int T__20=20; public static final int T__21=21; @@ -258,11 +257,10 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:21:7: ( 'ref' ) - // InternalBug250313.g:21:9: 'ref' + // InternalBug250313.g:21:7: ( '-' ) + // InternalBug250313.g:21:9: '-' { - match("ref"); - + match('-'); } @@ -279,28 +277,8 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:22:7: ( '-' ) - // InternalBug250313.g:22:9: '-' - { - match('-'); - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__22" - - // $ANTLR start "T__23" - public final void mT__23() throws RecognitionException { - try { - int _type = T__23; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:23:7: ( '+' ) - // InternalBug250313.g:23:9: '+' + // InternalBug250313.g:22:7: ( '+' ) + // InternalBug250313.g:22:9: '+' { match('+'); @@ -312,17 +290,17 @@ public class InternalBug250313Lexer extends Lexer { finally { } } - // $ANTLR end "T__23" + // $ANTLR end "T__22" // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:653:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalBug250313.g:653:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug250313.g:620:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalBug250313.g:620:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalBug250313.g:653:11: ( '^' )? + // InternalBug250313.g:620:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -331,7 +309,7 @@ public class InternalBug250313Lexer extends Lexer { } switch (alt1) { case 1 : - // InternalBug250313.g:653:11: '^' + // InternalBug250313.g:620:11: '^' { match('^'); @@ -349,7 +327,7 @@ public class InternalBug250313Lexer extends Lexer { recover(mse); throw mse;} - // InternalBug250313.g:653:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug250313.g:620:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -398,10 +376,10 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:655:10: ( ( '0' .. '9' )+ ) - // InternalBug250313.g:655:12: ( '0' .. '9' )+ + // InternalBug250313.g:622:10: ( ( '0' .. '9' )+ ) + // InternalBug250313.g:622:12: ( '0' .. '9' )+ { - // InternalBug250313.g:655:12: ( '0' .. '9' )+ + // InternalBug250313.g:622:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -415,7 +393,7 @@ public class InternalBug250313Lexer extends Lexer { switch (alt3) { case 1 : - // InternalBug250313.g:655:13: '0' .. '9' + // InternalBug250313.g:622:13: '0' .. '9' { matchRange('0','9'); @@ -447,10 +425,10 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:657:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalBug250313.g:657:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalBug250313.g:624:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalBug250313.g:624:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalBug250313.g:657:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalBug250313.g:624:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -468,10 +446,10 @@ public class InternalBug250313Lexer extends Lexer { } switch (alt6) { case 1 : - // InternalBug250313.g:657:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalBug250313.g:624:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalBug250313.g:657:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalBug250313.g:624:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -487,7 +465,7 @@ public class InternalBug250313Lexer extends Lexer { switch (alt4) { case 1 : - // InternalBug250313.g:657:21: '\\\\' . + // InternalBug250313.g:624:21: '\\\\' . { match('\\'); matchAny(); @@ -495,7 +473,7 @@ public class InternalBug250313Lexer extends Lexer { } break; case 2 : - // InternalBug250313.g:657:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalBug250313.g:624:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -520,10 +498,10 @@ public class InternalBug250313Lexer extends Lexer { } break; case 2 : - // InternalBug250313.g:657:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalBug250313.g:624:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalBug250313.g:657:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalBug250313.g:624:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -539,7 +517,7 @@ public class InternalBug250313Lexer extends Lexer { switch (alt5) { case 1 : - // InternalBug250313.g:657:54: '\\\\' . + // InternalBug250313.g:624:54: '\\\\' . { match('\\'); matchAny(); @@ -547,7 +525,7 @@ public class InternalBug250313Lexer extends Lexer { } break; case 2 : - // InternalBug250313.g:657:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalBug250313.g:624:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -590,12 +568,12 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:659:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalBug250313.g:659:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalBug250313.g:626:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalBug250313.g:626:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalBug250313.g:659:24: ( options {greedy=false; } : . )* + // InternalBug250313.g:626:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -620,7 +598,7 @@ public class InternalBug250313Lexer extends Lexer { switch (alt7) { case 1 : - // InternalBug250313.g:659:52: . + // InternalBug250313.g:626:52: . { matchAny(); @@ -650,12 +628,12 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:661:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalBug250313.g:661:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalBug250313.g:628:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalBug250313.g:628:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalBug250313.g:661:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalBug250313.g:628:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -668,7 +646,7 @@ public class InternalBug250313Lexer extends Lexer { switch (alt8) { case 1 : - // InternalBug250313.g:661:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalBug250313.g:628: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(); @@ -688,7 +666,7 @@ public class InternalBug250313Lexer extends Lexer { } } while (true); - // InternalBug250313.g:661:40: ( ( '\\r' )? '\\n' )? + // InternalBug250313.g:628:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -697,9 +675,9 @@ public class InternalBug250313Lexer extends Lexer { } switch (alt10) { case 1 : - // InternalBug250313.g:661:41: ( '\\r' )? '\\n' + // InternalBug250313.g:628:41: ( '\\r' )? '\\n' { - // InternalBug250313.g:661:41: ( '\\r' )? + // InternalBug250313.g:628:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -708,7 +686,7 @@ public class InternalBug250313Lexer extends Lexer { } switch (alt9) { case 1 : - // InternalBug250313.g:661:41: '\\r' + // InternalBug250313.g:628:41: '\\r' { match('\r'); @@ -740,10 +718,10 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:663:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalBug250313.g:663:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalBug250313.g:630:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalBug250313.g:630:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalBug250313.g:663:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalBug250313.g:630:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -797,8 +775,8 @@ public class InternalBug250313Lexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug250313.g:665:16: ( . ) - // InternalBug250313.g:665:18: . + // InternalBug250313.g:632:16: ( . ) + // InternalBug250313.g:632:18: . { matchAny(); @@ -813,8 +791,8 @@ public class InternalBug250313Lexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalBug250313.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt12=20; + // InternalBug250313.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt12=19; alt12 = dfa12.predict(input); switch (alt12) { case 1 : @@ -902,56 +880,49 @@ public class InternalBug250313Lexer extends Lexer { } break; case 13 : - // InternalBug250313.g:1:82: T__23 - { - mT__23(); - - } - break; - case 14 : - // InternalBug250313.g:1:88: RULE_ID + // InternalBug250313.g:1:82: RULE_ID { mRULE_ID(); } break; - case 15 : - // InternalBug250313.g:1:96: RULE_INT + case 14 : + // InternalBug250313.g:1:90: RULE_INT { mRULE_INT(); } break; - case 16 : - // InternalBug250313.g:1:105: RULE_STRING + case 15 : + // InternalBug250313.g:1:99: RULE_STRING { mRULE_STRING(); } break; - case 17 : - // InternalBug250313.g:1:117: RULE_ML_COMMENT + case 16 : + // InternalBug250313.g:1:111: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 18 : - // InternalBug250313.g:1:133: RULE_SL_COMMENT + case 17 : + // InternalBug250313.g:1:127: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 19 : - // InternalBug250313.g:1:149: RULE_WS + case 18 : + // InternalBug250313.g:1:143: RULE_WS { mRULE_WS(); } break; - case 20 : - // InternalBug250313.g:1:157: RULE_ANY_OTHER + case 19 : + // InternalBug250313.g:1:151: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -965,71 +936,67 @@ public class InternalBug250313Lexer extends Lexer { protected DFA12 dfa12 = new DFA12(this); static final String DFA12_eotS = - "\1\uffff\1\23\1\26\1\30\1\32\1\34\2\26\2\uffff\1\21\2\uffff\3\21\5\uffff\1\26\7\uffff\2\26\6\uffff\2\26\1\52\2\26\1\uffff\5\26\1\62\1\26\1\uffff\1\26\1\65\1\uffff"; + "\1\uffff\1\22\1\25\1\27\1\31\1\33\1\25\2\uffff\1\20\2\uffff\3\20\5\uffff\1\25\7\uffff\1\25\6\uffff\11\25\1\56\1\25\1\uffff\1\25\1\61\1\uffff"; static final String DFA12_eofS = - "\66\uffff"; + "\62\uffff"; static final String DFA12_minS = - "\1\0\1\53\1\171\3\53\1\157\1\145\2\uffff\1\101\2\uffff\2\0\1\52\5\uffff\1\153\7\uffff\1\156\1\146\6\uffff\1\145\1\164\1\60\1\171\1\145\1\uffff\1\167\1\156\1\157\1\164\1\162\1\60\1\144\1\uffff\1\61\1\60\1\uffff"; + "\1\0\1\53\1\171\3\53\1\157\2\uffff\1\101\2\uffff\2\0\1\52\5\uffff\1\153\7\uffff\1\156\6\uffff\1\145\1\164\1\171\1\145\1\167\1\156\1\157\1\164\1\162\1\60\1\144\1\uffff\1\61\1\60\1\uffff"; static final String DFA12_maxS = - "\1\uffff\1\71\1\171\3\71\1\157\1\145\2\uffff\1\172\2\uffff\2\uffff\1\57\5\uffff\1\153\7\uffff\1\156\1\146\6\uffff\1\145\1\164\1\172\1\171\1\145\1\uffff\1\167\1\156\1\157\1\164\1\162\1\172\1\144\1\uffff\1\61\1\172\1\uffff"; + "\1\uffff\1\71\1\171\3\71\1\157\2\uffff\1\172\2\uffff\2\uffff\1\57\5\uffff\1\153\7\uffff\1\156\6\uffff\1\145\1\164\1\171\1\145\1\167\1\156\1\157\1\164\1\162\1\172\1\144\1\uffff\1\61\1\172\1\uffff"; static final String DFA12_acceptS = - "\10\uffff\1\14\1\15\1\uffff\1\16\1\17\3\uffff\1\23\1\24\1\3\1\1\1\17\1\uffff\1\16\1\5\1\4\1\7\1\6\1\11\1\10\2\uffff\1\14\1\15\1\20\1\21\1\22\1\23\5\uffff\1\13\7\uffff\1\12\2\uffff\1\2"; + "\7\uffff\1\13\1\14\1\uffff\1\15\1\16\3\uffff\1\22\1\23\1\3\1\1\1\16\1\uffff\1\15\1\5\1\4\1\7\1\6\1\11\1\10\1\uffff\1\13\1\14\1\17\1\20\1\21\1\22\13\uffff\1\12\2\uffff\1\2"; static final String DFA12_specialS = - "\1\2\14\uffff\1\0\1\1\47\uffff}>"; + "\1\1\13\uffff\1\0\1\2\44\uffff}>"; static final String[] DFA12_transitionS = { - "\11\21\2\20\2\21\1\20\22\21\1\20\1\21\1\15\4\21\1\16\3\21\1\11\1\21\1\10\1\21\1\17\1\14\1\1\1\3\1\4\1\5\5\14\7\21\32\13\3\21\1\12\1\13\1\21\2\13\1\6\11\13\1\2\4\13\1\7\10\13\uff85\21", - "\1\22\4\uffff\12\24", - "\1\25", - "\1\27\4\uffff\12\24", - "\1\31\4\uffff\12\24", - "\1\33\4\uffff\12\24", - "\1\35", - "\1\36", + "\11\20\2\17\2\20\1\17\22\20\1\17\1\20\1\14\4\20\1\15\3\20\1\10\1\20\1\7\1\20\1\16\1\13\1\1\1\3\1\4\1\5\5\13\7\20\32\12\3\20\1\11\1\12\1\20\2\12\1\6\11\12\1\2\15\12\uff85\20", + "\1\21\4\uffff\12\23", + "\1\24", + "\1\26\4\uffff\12\23", + "\1\30\4\uffff\12\23", + "\1\32\4\uffff\12\23", + "\1\34", "", "", - "\32\26\4\uffff\1\26\1\uffff\32\26", + "\32\25\4\uffff\1\25\1\uffff\32\25", "", "", - "\0\41", - "\0\41", - "\1\42\4\uffff\1\43", + "\0\37", + "\0\37", + "\1\40\4\uffff\1\41", + "", + "", + "", + "", + "", + "\1\43", + "", + "", + "", + "", + "", + "", + "", + "\1\44", + "", "", "", "", "", "", "\1\45", - "", - "", - "", - "", - "", - "", - "", "\1\46", "\1\47", - "", - "", - "", - "", - "", - "", "\1\50", "\1\51", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", + "\1\52", "\1\53", "\1\54", - "", "\1\55", - "\1\56", + "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", "\1\57", - "\1\60", - "\1\61", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", - "\1\63", "", - "\1\64", - "\12\26\7\uffff\32\26\4\uffff\1\26\1\uffff\32\26", + "\1\60", + "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", "" }; @@ -1063,33 +1030,23 @@ public class InternalBug250313Lexer extends Lexer { this.transition = DFA12_transition; } public String getDescription() { - return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | 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_13 = input.LA(1); + int LA12_12 = input.LA(1); s = -1; - if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFF')) ) {s = 33;} + if ( ((LA12_12>='\u0000' && LA12_12<='\uFFFF')) ) {s = 31;} - else s = 17; + else s = 16; if ( s>=0 ) return s; break; case 1 : - int LA12_14 = input.LA(1); - - s = -1; - if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFF')) ) {s = 33;} - - else s = 17; - - if ( s>=0 ) return s; - break; - case 2 : int LA12_0 = input.LA(1); s = -1; @@ -1105,27 +1062,35 @@ public class InternalBug250313Lexer extends Lexer { else if ( (LA12_0=='c') ) {s = 6;} - else if ( (LA12_0=='r') ) {s = 7;} + else if ( (LA12_0=='-') ) {s = 7;} - else if ( (LA12_0=='-') ) {s = 8;} + else if ( (LA12_0=='+') ) {s = 8;} - else if ( (LA12_0=='+') ) {s = 9;} + else if ( (LA12_0=='^') ) {s = 9;} - else if ( (LA12_0=='^') ) {s = 10;} + else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||(LA12_0>='d' && LA12_0<='l')||(LA12_0>='n' && LA12_0<='z')) ) {s = 10;} - else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||(LA12_0>='d' && LA12_0<='l')||(LA12_0>='n' && LA12_0<='q')||(LA12_0>='s' && LA12_0<='z')) ) {s = 11;} + else if ( (LA12_0=='0'||(LA12_0>='5' && LA12_0<='9')) ) {s = 11;} - else if ( (LA12_0=='0'||(LA12_0>='5' && LA12_0<='9')) ) {s = 12;} + else if ( (LA12_0=='\"') ) {s = 12;} - else if ( (LA12_0=='\"') ) {s = 13;} + else if ( (LA12_0=='\'') ) {s = 13;} - else if ( (LA12_0=='\'') ) {s = 14;} + else if ( (LA12_0=='/') ) {s = 14;} - else if ( (LA12_0=='/') ) {s = 15;} + else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 15;} - else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 16;} + 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>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 16;} - 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>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 17;} + if ( s>=0 ) return s; + break; + case 2 : + int LA12_13 = input.LA(1); + + s = -1; + if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFF')) ) {s = 31;} + + else s = 16; if ( s>=0 ) return s; break; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java index ef1160b5b..af737e6a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/parser/antlr/internal/InternalBug250313Parser.java @@ -21,7 +21,7 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalBug250313Parser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'1'", "'mykeyword1'", "'1+'", "'2'", "'2+'", "'3'", "'3+'", "'4'", "'4+'", "'content'", "'ref'", "'-'", "'+'" + "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'1'", "'mykeyword1'", "'1+'", "'2'", "'2+'", "'3'", "'3+'", "'4'", "'4+'", "'content'", "'-'", "'+'" }; public static final int RULE_STRING=4; public static final int RULE_SL_COMMENT=8; @@ -41,7 +41,6 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { public static final int RULE_INT=6; public static final int T__22=22; public static final int RULE_ML_COMMENT=7; - public static final int T__23=23; public static final int T__20=20; public static final int T__21=21; @@ -121,7 +120,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleModel" - // InternalBug250313.g:71:1: ruleModel returns [EObject current=null] : ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) ) ; + // InternalBug250313.g:71:1: ruleModel returns [EObject current=null] : ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -142,8 +141,6 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { Token otherlv_12=null; Token otherlv_14=null; Token otherlv_16=null; - Token otherlv_18=null; - Token otherlv_19=null; AntlrDatatypeRuleToken lv_value_1_3 = null; AntlrDatatypeRuleToken lv_value_1_4 = null; @@ -167,68 +164,68 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:77:2: ( ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) ) ) - // InternalBug250313.g:78:2: ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) ) + // InternalBug250313.g:77:2: ( ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) ) ) + // InternalBug250313.g:78:2: ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) ) { - // InternalBug250313.g:78:2: ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) ) - int alt6=9; + // InternalBug250313.g:78:2: ( ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) | (otherlv_2= '1+' ( ( (lv_multiValue_3_1= 'mykeyword1' | lv_multiValue_3_2= RULE_STRING | lv_multiValue_3_3= ruleNestedDatatype | lv_multiValue_3_4= ruleDatatype | lv_multiValue_3_5= RULE_ID ) ) ) ) | (otherlv_4= '2' ( (lv_value_5_0= RULE_STRING ) ) ) | (otherlv_6= '2+' ( (lv_multiValue_7_0= RULE_STRING ) ) ) | (otherlv_8= '3' ( (lv_value_9_0= ruleDatatype ) ) ) | (otherlv_10= '3+' ( (lv_multiValue_11_0= ruleDatatype ) ) ) | (otherlv_12= '4' ( (lv_value_13_0= ruleNestedDatatype ) ) ) | (otherlv_14= '4+' ( (lv_multiValue_15_0= ruleNestedDatatype ) ) ) | (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) ) + int alt4=9; switch ( input.LA(1) ) { case RULE_STRING: case RULE_ID: case 11: case 12: { - alt6=1; + alt4=1; } break; case 13: { - alt6=2; + alt4=2; } break; case 14: { - alt6=3; + alt4=3; } break; case 15: { - alt6=4; + alt4=4; } break; case 16: { - alt6=5; + alt4=5; } break; case 17: { - alt6=6; + alt4=6; } break; case 18: { - alt6=7; + alt4=7; } break; case 19: { - alt6=8; + alt4=8; } break; case 20: { - alt6=9; + alt4=9; } break; default: NoViableAltException nvae = - new NoViableAltException("", 6, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } - switch (alt6) { + switch (alt4) { case 1 : // InternalBug250313.g:79:3: ( (otherlv_0= '1' )? ( ( (lv_value_1_1= 'mykeyword1' | lv_value_1_2= RULE_STRING | lv_value_1_3= ruleNestedDatatype | lv_value_1_4= ruleDatatype | lv_value_1_5= RULE_ID ) ) ) ) { @@ -278,21 +275,21 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { case RULE_ID: { switch ( input.LA(2) ) { - case EOF: - { - alt2=5; - } - break; - case 22: + case 21: { alt2=4; } break; - case 23: + case 22: { alt2=3; } break; + case EOF: + { + alt2=5; + } + break; default: NoViableAltException nvae = new NoViableAltException("", 2, 3, input); @@ -463,21 +460,21 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { case RULE_ID: { switch ( input.LA(2) ) { + case 22: + { + alt3=3; + } + break; case EOF: { alt3=5; } break; - case 22: + case 21: { alt3=4; } break; - case 23: - { - alt3=3; - } - break; default: NoViableAltException nvae = new NoViableAltException("", 3, 3, input); @@ -889,43 +886,40 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { } break; case 9 : - // InternalBug250313.g:405:3: ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) + // InternalBug250313.g:405:3: (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) { - // InternalBug250313.g:405:3: ( (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? ) - // InternalBug250313.g:406:4: (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? - { - // InternalBug250313.g:406:4: (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) - // InternalBug250313.g:407:5: otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) + // InternalBug250313.g:405:3: (otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) ) + // InternalBug250313.g:406:4: otherlv_16= 'content' ( (lv_children_17_0= ruleChild ) ) { otherlv_16=(Token)match(input,20,FollowSets000.FOLLOW_6); - newLeafNode(otherlv_16, grammarAccess.getModelAccess().getContentKeyword_8_0_0()); - - // InternalBug250313.g:411:5: ( (lv_children_17_0= ruleChild ) ) - // InternalBug250313.g:412:6: (lv_children_17_0= ruleChild ) + newLeafNode(otherlv_16, grammarAccess.getModelAccess().getContentKeyword_8_0()); + + // InternalBug250313.g:410:4: ( (lv_children_17_0= ruleChild ) ) + // InternalBug250313.g:411:5: (lv_children_17_0= ruleChild ) { - // InternalBug250313.g:412:6: (lv_children_17_0= ruleChild ) - // InternalBug250313.g:413:7: lv_children_17_0= ruleChild + // InternalBug250313.g:411:5: (lv_children_17_0= ruleChild ) + // InternalBug250313.g:412:6: lv_children_17_0= ruleChild { - newCompositeNode(grammarAccess.getModelAccess().getChildrenChildParserRuleCall_8_0_1_0()); - - pushFollow(FollowSets000.FOLLOW_7); + newCompositeNode(grammarAccess.getModelAccess().getChildrenChildParserRuleCall_8_1_0()); + + pushFollow(FollowSets000.FOLLOW_2); lv_children_17_0=ruleChild(); state._fsp--; - if (current==null) { - current = createModelElementForParent(grammarAccess.getModelRule()); - } - set( - current, - "children", - lv_children_17_0, - "org.eclipse.xtext.valueconverter.Bug250313.Child"); - afterParserOrEnumRuleCall(); - + if (current==null) { + current = createModelElementForParent(grammarAccess.getModelRule()); + } + set( + current, + "children", + lv_children_17_0, + "org.eclipse.xtext.valueconverter.Bug250313.Child"); + afterParserOrEnumRuleCall(); + } @@ -933,92 +927,6 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { } - } - - // InternalBug250313.g:431:4: (otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) )? - int alt5=2; - int LA5_0 = input.LA(1); - - if ( (LA5_0==21) ) { - alt5=1; - } - switch (alt5) { - case 1 : - // InternalBug250313.g:432:5: otherlv_18= 'ref' ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) - { - otherlv_18=(Token)match(input,21,FollowSets000.FOLLOW_6); - - newLeafNode(otherlv_18, grammarAccess.getModelAccess().getRefKeyword_8_1_0()); - - // InternalBug250313.g:436:5: ( ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) ) - // InternalBug250313.g:437:6: ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) - { - // InternalBug250313.g:437:6: ( (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) ) - // InternalBug250313.g:438:7: (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) - { - // InternalBug250313.g:438:7: (otherlv_19= RULE_STRING | otherlv_19= RULE_ID ) - int alt4=2; - int LA4_0 = input.LA(1); - - if ( (LA4_0==RULE_STRING) ) { - alt4=1; - } - else if ( (LA4_0==RULE_ID) ) { - alt4=2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 4, 0, input); - - throw nvae; - } - switch (alt4) { - case 1 : - // InternalBug250313.g:439:8: otherlv_19= RULE_STRING - { - - if (current==null) { - current = createModelElement(grammarAccess.getModelRule()); - } - - otherlv_19=(Token)match(input,RULE_STRING,FollowSets000.FOLLOW_2); - - newLeafNode(otherlv_19, grammarAccess.getModelAccess().getRefChild1CrossReference_8_1_1_0_0()); - - - } - break; - case 2 : - // InternalBug250313.g:449:8: otherlv_19= RULE_ID - { - - if (current==null) { - current = createModelElement(grammarAccess.getModelRule()); - } - - otherlv_19=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); - - newLeafNode(otherlv_19, grammarAccess.getModelAccess().getRefChild2CrossReference_8_1_1_0_1()); - - - } - break; - - } - - - } - - - } - - - } - break; - - } - - } @@ -1047,7 +955,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleDatatype" - // InternalBug250313.g:467:1: entryRuleDatatype returns [String current=null] : iv_ruleDatatype= ruleDatatype EOF ; + // InternalBug250313.g:434:1: entryRuleDatatype returns [String current=null] : iv_ruleDatatype= ruleDatatype EOF ; public final String entryRuleDatatype() throws RecognitionException { String current = null; @@ -1055,8 +963,8 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { try { - // InternalBug250313.g:467:48: (iv_ruleDatatype= ruleDatatype EOF ) - // InternalBug250313.g:468:2: iv_ruleDatatype= ruleDatatype EOF + // InternalBug250313.g:434:48: (iv_ruleDatatype= ruleDatatype EOF ) + // InternalBug250313.g:435:2: iv_ruleDatatype= ruleDatatype EOF { newCompositeNode(grammarAccess.getDatatypeRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -1083,7 +991,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleDatatype" - // InternalBug250313.g:474:1: ruleDatatype returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) ; + // InternalBug250313.g:441:1: ruleDatatype returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) ; public final AntlrDatatypeRuleToken ruleDatatype() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -1095,20 +1003,20 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:480:2: ( (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) ) - // InternalBug250313.g:481:2: (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) + // InternalBug250313.g:447:2: ( (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) ) + // InternalBug250313.g:448:2: (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) { - // InternalBug250313.g:481:2: (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) - // InternalBug250313.g:482:3: this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID + // InternalBug250313.g:448:2: (this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID ) + // InternalBug250313.g:449:3: this_ID_0= RULE_ID kw= '-' this_ID_2= RULE_ID { - this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_8); + this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_7); current.merge(this_ID_0); newLeafNode(this_ID_0, grammarAccess.getDatatypeAccess().getIDTerminalRuleCall_0()); - kw=(Token)match(input,22,FollowSets000.FOLLOW_5); + kw=(Token)match(input,21,FollowSets000.FOLLOW_5); current.merge(kw); newLeafNode(kw, grammarAccess.getDatatypeAccess().getHyphenMinusKeyword_1()); @@ -1143,7 +1051,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleNestedDatatype" - // InternalBug250313.g:505:1: entryRuleNestedDatatype returns [String current=null] : iv_ruleNestedDatatype= ruleNestedDatatype EOF ; + // InternalBug250313.g:472:1: entryRuleNestedDatatype returns [String current=null] : iv_ruleNestedDatatype= ruleNestedDatatype EOF ; public final String entryRuleNestedDatatype() throws RecognitionException { String current = null; @@ -1151,8 +1059,8 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { try { - // InternalBug250313.g:505:54: (iv_ruleNestedDatatype= ruleNestedDatatype EOF ) - // InternalBug250313.g:506:2: iv_ruleNestedDatatype= ruleNestedDatatype EOF + // InternalBug250313.g:472:54: (iv_ruleNestedDatatype= ruleNestedDatatype EOF ) + // InternalBug250313.g:473:2: iv_ruleNestedDatatype= ruleNestedDatatype EOF { newCompositeNode(grammarAccess.getNestedDatatypeRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -1179,7 +1087,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleNestedDatatype" - // InternalBug250313.g:512:1: ruleNestedDatatype returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) ; + // InternalBug250313.g:479:1: ruleNestedDatatype returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) ; public final AntlrDatatypeRuleToken ruleNestedDatatype() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -1192,34 +1100,34 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:518:2: ( (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) ) - // InternalBug250313.g:519:2: (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) + // InternalBug250313.g:485:2: ( (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) ) + // InternalBug250313.g:486:2: (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) { - // InternalBug250313.g:519:2: (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) - // InternalBug250313.g:520:3: this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? + // InternalBug250313.g:486:2: (this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? ) + // InternalBug250313.g:487:3: this_ID_0= RULE_ID kw= '+' (this_Datatype_2= ruleDatatype )? { - this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_9); + this_ID_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_8); current.merge(this_ID_0); newLeafNode(this_ID_0, grammarAccess.getNestedDatatypeAccess().getIDTerminalRuleCall_0()); - kw=(Token)match(input,23,FollowSets000.FOLLOW_10); + kw=(Token)match(input,22,FollowSets000.FOLLOW_9); current.merge(kw); newLeafNode(kw, grammarAccess.getNestedDatatypeAccess().getPlusSignKeyword_1()); - // InternalBug250313.g:532:3: (this_Datatype_2= ruleDatatype )? - int alt7=2; - int LA7_0 = input.LA(1); + // InternalBug250313.g:499:3: (this_Datatype_2= ruleDatatype )? + int alt5=2; + int LA5_0 = input.LA(1); - if ( (LA7_0==RULE_ID) ) { - alt7=1; + if ( (LA5_0==RULE_ID) ) { + alt5=1; } - switch (alt7) { + switch (alt5) { case 1 : - // InternalBug250313.g:533:4: this_Datatype_2= ruleDatatype + // InternalBug250313.g:500:4: this_Datatype_2= ruleDatatype { newCompositeNode(grammarAccess.getNestedDatatypeAccess().getDatatypeParserRuleCall_2()); @@ -1264,7 +1172,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleChild" - // InternalBug250313.g:548:1: entryRuleChild returns [EObject current=null] : iv_ruleChild= ruleChild EOF ; + // InternalBug250313.g:515:1: entryRuleChild returns [EObject current=null] : iv_ruleChild= ruleChild EOF ; public final EObject entryRuleChild() throws RecognitionException { EObject current = null; @@ -1272,8 +1180,8 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { try { - // InternalBug250313.g:548:46: (iv_ruleChild= ruleChild EOF ) - // InternalBug250313.g:549:2: iv_ruleChild= ruleChild EOF + // InternalBug250313.g:515:46: (iv_ruleChild= ruleChild EOF ) + // InternalBug250313.g:516:2: iv_ruleChild= ruleChild EOF { newCompositeNode(grammarAccess.getChildRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -1300,7 +1208,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleChild" - // InternalBug250313.g:555:1: ruleChild returns [EObject current=null] : (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) ; + // InternalBug250313.g:522:1: ruleChild returns [EObject current=null] : (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) ; public final EObject ruleChild() throws RecognitionException { EObject current = null; @@ -1313,28 +1221,28 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:561:2: ( (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) ) - // InternalBug250313.g:562:2: (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) + // InternalBug250313.g:528:2: ( (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) ) + // InternalBug250313.g:529:2: (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) { - // InternalBug250313.g:562:2: (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) - int alt8=2; - int LA8_0 = input.LA(1); + // InternalBug250313.g:529:2: (this_Child1_0= ruleChild1 | this_Child2_1= ruleChild2 ) + int alt6=2; + int LA6_0 = input.LA(1); - if ( (LA8_0==RULE_ID) ) { - alt8=1; + if ( (LA6_0==RULE_ID) ) { + alt6=1; } - else if ( (LA8_0==RULE_STRING) ) { - alt8=2; + else if ( (LA6_0==RULE_STRING) ) { + alt6=2; } else { NoViableAltException nvae = - new NoViableAltException("", 8, 0, input); + new NoViableAltException("", 6, 0, input); throw nvae; } - switch (alt8) { + switch (alt6) { case 1 : - // InternalBug250313.g:563:3: this_Child1_0= ruleChild1 + // InternalBug250313.g:530:3: this_Child1_0= ruleChild1 { newCompositeNode(grammarAccess.getChildAccess().getChild1ParserRuleCall_0()); @@ -1352,7 +1260,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { } break; case 2 : - // InternalBug250313.g:572:3: this_Child2_1= ruleChild2 + // InternalBug250313.g:539:3: this_Child2_1= ruleChild2 { newCompositeNode(grammarAccess.getChildAccess().getChild2ParserRuleCall_1()); @@ -1392,7 +1300,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleChild1" - // InternalBug250313.g:584:1: entryRuleChild1 returns [EObject current=null] : iv_ruleChild1= ruleChild1 EOF ; + // InternalBug250313.g:551:1: entryRuleChild1 returns [EObject current=null] : iv_ruleChild1= ruleChild1 EOF ; public final EObject entryRuleChild1() throws RecognitionException { EObject current = null; @@ -1400,8 +1308,8 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { try { - // InternalBug250313.g:584:47: (iv_ruleChild1= ruleChild1 EOF ) - // InternalBug250313.g:585:2: iv_ruleChild1= ruleChild1 EOF + // InternalBug250313.g:551:47: (iv_ruleChild1= ruleChild1 EOF ) + // InternalBug250313.g:552:2: iv_ruleChild1= ruleChild1 EOF { newCompositeNode(grammarAccess.getChild1Rule()); pushFollow(FollowSets000.FOLLOW_1); @@ -1428,7 +1336,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleChild1" - // InternalBug250313.g:591:1: ruleChild1 returns [EObject current=null] : ( (lv_name_0_0= RULE_ID ) ) ; + // InternalBug250313.g:558:1: ruleChild1 returns [EObject current=null] : ( (lv_name_0_0= RULE_ID ) ) ; public final EObject ruleChild1() throws RecognitionException { EObject current = null; @@ -1438,14 +1346,14 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:597:2: ( ( (lv_name_0_0= RULE_ID ) ) ) - // InternalBug250313.g:598:2: ( (lv_name_0_0= RULE_ID ) ) + // InternalBug250313.g:564:2: ( ( (lv_name_0_0= RULE_ID ) ) ) + // InternalBug250313.g:565:2: ( (lv_name_0_0= RULE_ID ) ) { - // InternalBug250313.g:598:2: ( (lv_name_0_0= RULE_ID ) ) - // InternalBug250313.g:599:3: (lv_name_0_0= RULE_ID ) + // InternalBug250313.g:565:2: ( (lv_name_0_0= RULE_ID ) ) + // InternalBug250313.g:566:3: (lv_name_0_0= RULE_ID ) { - // InternalBug250313.g:599:3: (lv_name_0_0= RULE_ID ) - // InternalBug250313.g:600:4: lv_name_0_0= RULE_ID + // InternalBug250313.g:566:3: (lv_name_0_0= RULE_ID ) + // InternalBug250313.g:567:4: lv_name_0_0= RULE_ID { lv_name_0_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_2); @@ -1487,7 +1395,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleChild2" - // InternalBug250313.g:619:1: entryRuleChild2 returns [EObject current=null] : iv_ruleChild2= ruleChild2 EOF ; + // InternalBug250313.g:586:1: entryRuleChild2 returns [EObject current=null] : iv_ruleChild2= ruleChild2 EOF ; public final EObject entryRuleChild2() throws RecognitionException { EObject current = null; @@ -1495,8 +1403,8 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { try { - // InternalBug250313.g:619:47: (iv_ruleChild2= ruleChild2 EOF ) - // InternalBug250313.g:620:2: iv_ruleChild2= ruleChild2 EOF + // InternalBug250313.g:586:47: (iv_ruleChild2= ruleChild2 EOF ) + // InternalBug250313.g:587:2: iv_ruleChild2= ruleChild2 EOF { newCompositeNode(grammarAccess.getChild2Rule()); pushFollow(FollowSets000.FOLLOW_1); @@ -1523,7 +1431,7 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { // $ANTLR start "ruleChild2" - // InternalBug250313.g:626:1: ruleChild2 returns [EObject current=null] : ( (lv_name_0_0= RULE_STRING ) ) ; + // InternalBug250313.g:593:1: ruleChild2 returns [EObject current=null] : ( (lv_name_0_0= RULE_STRING ) ) ; public final EObject ruleChild2() throws RecognitionException { EObject current = null; @@ -1533,14 +1441,14 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalBug250313.g:632:2: ( ( (lv_name_0_0= RULE_STRING ) ) ) - // InternalBug250313.g:633:2: ( (lv_name_0_0= RULE_STRING ) ) + // InternalBug250313.g:599:2: ( ( (lv_name_0_0= RULE_STRING ) ) ) + // InternalBug250313.g:600:2: ( (lv_name_0_0= RULE_STRING ) ) { - // InternalBug250313.g:633:2: ( (lv_name_0_0= RULE_STRING ) ) - // InternalBug250313.g:634:3: (lv_name_0_0= RULE_STRING ) + // InternalBug250313.g:600:2: ( (lv_name_0_0= RULE_STRING ) ) + // InternalBug250313.g:601:3: (lv_name_0_0= RULE_STRING ) { - // InternalBug250313.g:634:3: (lv_name_0_0= RULE_STRING ) - // InternalBug250313.g:635:4: lv_name_0_0= RULE_STRING + // InternalBug250313.g:601:3: (lv_name_0_0= RULE_STRING ) + // InternalBug250313.g:602:4: lv_name_0_0= RULE_STRING { lv_name_0_0=(Token)match(input,RULE_STRING,FollowSets000.FOLLOW_2); @@ -1593,10 +1501,9 @@ public class InternalBug250313Parser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000020L}); public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000030L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000200002L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000200000L}); public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000400000L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000800000L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000022L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000022L}); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/serializer/Bug250313SemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/serializer/Bug250313SemanticSequencer.java index f5cbae72d..daba49377 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/serializer/Bug250313SemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/serializer/Bug250313SemanticSequencer.java @@ -108,7 +108,7 @@ public class Bug250313SemanticSequencer extends AbstractDelegatingSemanticSequen * multiValue+=Datatype | * value=NestedDatatype | * multiValue+=NestedDatatype | - * (children=Child (ref=[Child1|STRING] | ref=[Child2|ID])?) + * children=Child * ) */ protected void sequence_Model(ISerializationContext context, Model semanticObject) { 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 bdb29db8f..c9a1d0ad1 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 @@ -8,7 +8,6 @@ import com.google.inject.Singleton; import java.util.List; import org.eclipse.xtext.Alternatives; import org.eclipse.xtext.Assignment; -import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Group; @@ -69,30 +68,19 @@ public class Bug250313GrammarAccess extends AbstractGrammarElementFinder { private final Assignment cMultiValueAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1); private final RuleCall cMultiValueNestedDatatypeParserRuleCall_7_1_0 = (RuleCall)cMultiValueAssignment_7_1.eContents().get(0); private final Group cGroup_8 = (Group)cAlternatives.eContents().get(8); - private final Group cGroup_8_0 = (Group)cGroup_8.eContents().get(0); - private final Keyword cContentKeyword_8_0_0 = (Keyword)cGroup_8_0.eContents().get(0); - private final Assignment cChildrenAssignment_8_0_1 = (Assignment)cGroup_8_0.eContents().get(1); - private final RuleCall cChildrenChildParserRuleCall_8_0_1_0 = (RuleCall)cChildrenAssignment_8_0_1.eContents().get(0); - private final Group cGroup_8_1 = (Group)cGroup_8.eContents().get(1); - private final Keyword cRefKeyword_8_1_0 = (Keyword)cGroup_8_1.eContents().get(0); - private final Assignment cRefAssignment_8_1_1 = (Assignment)cGroup_8_1.eContents().get(1); - private final Alternatives cRefAlternatives_8_1_1_0 = (Alternatives)cRefAssignment_8_1_1.eContents().get(0); - private final CrossReference cRefChild1CrossReference_8_1_1_0_0 = (CrossReference)cRefAlternatives_8_1_1_0.eContents().get(0); - private final RuleCall cRefChild1STRINGTerminalRuleCall_8_1_1_0_0_1 = (RuleCall)cRefChild1CrossReference_8_1_1_0_0.eContents().get(1); - private final CrossReference cRefChild2CrossReference_8_1_1_0_1 = (CrossReference)cRefAlternatives_8_1_1_0.eContents().get(1); - private final RuleCall cRefChild2IDTerminalRuleCall_8_1_1_0_1_1 = (RuleCall)cRefChild2CrossReference_8_1_1_0_1.eContents().get(1); + private final Keyword cContentKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0); + private final Assignment cChildrenAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1); + private final RuleCall cChildrenChildParserRuleCall_8_1_0 = (RuleCall)cChildrenAssignment_8_1.eContents().get(0); //Model: // '1'? value=('mykeyword1' | STRING | NestedDatatype | Datatype | ID) | '1+' multiValue+=('mykeyword1' | STRING | // NestedDatatype | Datatype | ID) | '2' value=STRING | '2+' multiValue+=STRING | '3' value=Datatype | '3+' - // multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | ('content' children=Child) ('ref' - // ref=([Child1|STRING] | [Child2]))?; + // multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | 'content' children=Child; @Override public ParserRule getRule() { return rule; } //'1'? value=('mykeyword1' | STRING | NestedDatatype | Datatype | ID) | '1+' multiValue+=('mykeyword1' | STRING | //NestedDatatype | Datatype | ID) | '2' value=STRING | '2+' multiValue+=STRING | '3' value=Datatype | '3+' - //multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | ('content' children=Child) ('ref' - //ref=([Child1|STRING] | [Child2]))? + //multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | 'content' children=Child public Alternatives getAlternatives() { return cAlternatives; } //'1'? value=('mykeyword1' | STRING | NestedDatatype | Datatype | ID) @@ -221,44 +209,17 @@ public class Bug250313GrammarAccess extends AbstractGrammarElementFinder { //NestedDatatype public RuleCall getMultiValueNestedDatatypeParserRuleCall_7_1_0() { return cMultiValueNestedDatatypeParserRuleCall_7_1_0; } - //('content' children=Child) ('ref' ref=([Child1|STRING] | [Child2]))? + //'content' children=Child public Group getGroup_8() { return cGroup_8; } - //('content' children=Child) - public Group getGroup_8_0() { return cGroup_8_0; } - //'content' - public Keyword getContentKeyword_8_0_0() { return cContentKeyword_8_0_0; } + public Keyword getContentKeyword_8_0() { return cContentKeyword_8_0; } //children=Child - public Assignment getChildrenAssignment_8_0_1() { return cChildrenAssignment_8_0_1; } + public Assignment getChildrenAssignment_8_1() { return cChildrenAssignment_8_1; } //Child - public RuleCall getChildrenChildParserRuleCall_8_0_1_0() { return cChildrenChildParserRuleCall_8_0_1_0; } - - //('ref' ref=([Child1|STRING] | [Child2]))? - public Group getGroup_8_1() { return cGroup_8_1; } - - //'ref' - public Keyword getRefKeyword_8_1_0() { return cRefKeyword_8_1_0; } - - //ref=([Child1|STRING] | [Child2]) - public Assignment getRefAssignment_8_1_1() { return cRefAssignment_8_1_1; } - - //([Child1|STRING] | [Child2]) - public Alternatives getRefAlternatives_8_1_1_0() { return cRefAlternatives_8_1_1_0; } - - //[Child1|STRING] - public CrossReference getRefChild1CrossReference_8_1_1_0_0() { return cRefChild1CrossReference_8_1_1_0_0; } - - //STRING - public RuleCall getRefChild1STRINGTerminalRuleCall_8_1_1_0_0_1() { return cRefChild1STRINGTerminalRuleCall_8_1_1_0_0_1; } - - //[Child2] - public CrossReference getRefChild2CrossReference_8_1_1_0_1() { return cRefChild2CrossReference_8_1_1_0_1; } - - //ID - public RuleCall getRefChild2IDTerminalRuleCall_8_1_1_0_1_1() { return cRefChild2IDTerminalRuleCall_8_1_1_0_1_1; } + public RuleCall getChildrenChildParserRuleCall_8_1_0() { return cChildrenChildParserRuleCall_8_1_0; } } public class DatatypeElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.valueconverter.Bug250313.Datatype"); @@ -411,8 +372,7 @@ public class Bug250313GrammarAccess extends AbstractGrammarElementFinder { //Model: // '1'? value=('mykeyword1' | STRING | NestedDatatype | Datatype | ID) | '1+' multiValue+=('mykeyword1' | STRING | // NestedDatatype | Datatype | ID) | '2' value=STRING | '2+' multiValue+=STRING | '3' value=Datatype | '3+' - // multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | ('content' children=Child) ('ref' - // ref=([Child1|STRING] | [Child2]))?; + // multiValue+=Datatype | '4' value=NestedDatatype | '4+' multiValue+=NestedDatatype | 'content' children=Child; public ModelElements getModelAccess() { return pModel; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractMultiValueFeatureTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractMultiValueFeatureTestLanguageRuntimeModule.java index 015ec33f6..05ba1bea7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractMultiValueFeatureTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractMultiValueFeatureTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeModule extends } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalMultiValueFeatureTestLanguageLexer() { + public Provider provideInternalMultiValueFeatureTestLanguageLexer() { return LexerProvider.create(InternalMultiValueFeatureTestLanguageLexer.class); } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java index 0b01b76fd..13509f5bc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java @@ -79,7 +79,7 @@ public abstract class AbstractUnassignedRuleCallTestLanguageRuntimeModule extend } // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 - public Provider provideInternalUnassignedRuleCallTestLanguageLexer() { + public Provider provideInternalUnassignedRuleCallTestLanguageLexer() { return LexerProvider.create(InternalUnassignedRuleCallTestLanguageLexer.class); }