From 69c1e29a7c2019e99c10c12f51bbe1908858332a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Tue, 12 Jul 2016 14:15:38 +0200 Subject: [PATCH] Generated EcoreInferenceTestLanguages --- ...ValueFeatureTestLanguageRuntimeModule.java | 128 ++++---- ...gnedRuleCallTestLanguageRuntimeModule.java | 128 ++++---- .../MultiValueFeatureTestLanguage.ecore | 2 +- .../MultiValueFeatureTestLanguage.genmodel | 13 +- ...eTestLanguageStandaloneSetupGenerated.java | 32 +- .../UnassignedRuleCallTestLanguage.ecore | 2 +- .../UnassignedRuleCallTestLanguage.genmodel | 13 +- ...lTestLanguageStandaloneSetupGenerated.java | 32 +- .../MultiValueFeatureTestLanguageFactory.java | 1 + .../MultiValueFeatureTestLanguagePackage.java | 1 + .../multiValueFeatureTestLanguage/Start.java | 1 + ...tiValueFeatureTestLanguageFactoryImpl.java | 1 + ...tiValueFeatureTestLanguagePackageImpl.java | 10 +- .../impl/StartImpl.java | 1 + ...alueFeatureTestLanguageAdapterFactory.java | 1 + .../MultiValueFeatureTestLanguageSwitch.java | 1 + ...ureTestLanguageAntlrTokenFileProvider.java | 4 +- .../MultiValueFeatureTestLanguageParser.java | 21 +- ...allTestLanguageAntlrTokenFileProvider.java | 4 +- .../UnassignedRuleCallTestLanguageParser.java | 21 +- ...bugInternalMultiValueFeatureTestLanguage.g | 71 ----- ...ugInternalUnassignedRuleCallTestLanguage.g | 81 ----- .../InternalMultiValueFeatureTestLanguage.g | 87 +++--- ...nalMultiValueFeatureTestLanguageLexer.java | 74 ++--- ...alMultiValueFeatureTestLanguageParser.java | 78 ++--- .../InternalUnassignedRuleCallTestLanguage.g | 284 +++++++++--------- ...alUnassignedRuleCallTestLanguageLexer.java | 74 ++--- ...lUnassignedRuleCallTestLanguageParser.java | 282 ++++++++--------- ...ValueFeatureTestLanguageGrammarAccess.java | 55 ++-- ...gnedRuleCallTestLanguageGrammarAccess.java | 91 +++--- .../unassignedRuleCallTestLanguage/Model.java | 1 + .../ModelFeatures.java | 1 + ...UnassignedRuleCallTestLanguageFactory.java | 1 + ...UnassignedRuleCallTestLanguagePackage.java | 1 + .../impl/ModelFeaturesImpl.java | 1 + .../impl/ModelImpl.java | 1 + ...signedRuleCallTestLanguageFactoryImpl.java | 1 + ...signedRuleCallTestLanguagePackageImpl.java | 10 +- ...nedRuleCallTestLanguageAdapterFactory.java | 1 + .../UnassignedRuleCallTestLanguageSwitch.java | 1 + 40 files changed, 752 insertions(+), 861 deletions(-) delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalMultiValueFeatureTestLanguage.g delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalUnassignedRuleCallTestLanguage.g 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 a8bbc36c1..015ec33f6 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 @@ -3,18 +3,38 @@ */ package org.eclipse.xtext.xtext.ecoreInference; -import java.util.Properties; - -import org.eclipse.xtext.Constants; - import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.Properties; +import org.eclipse.xtext.Constants; +import org.eclipse.xtext.IGrammarAccess; +import org.eclipse.xtext.parser.IParser; +import org.eclipse.xtext.parser.ITokenToStringConverter; +import org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider; +import org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter; +import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider; +import org.eclipse.xtext.parser.antlr.ITokenDefProvider; +import org.eclipse.xtext.parser.antlr.Lexer; +import org.eclipse.xtext.parser.antlr.LexerBindings; +import org.eclipse.xtext.parser.antlr.LexerProvider; +import org.eclipse.xtext.serializer.ISerializer; +import org.eclipse.xtext.serializer.impl.Serializer; +import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; +import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; +import org.eclipse.xtext.service.DefaultRuntimeModule; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.MultiValueFeatureTestLanguageAntlrTokenFileProvider; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.MultiValueFeatureTestLanguageParser; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageLexer; +import org.eclipse.xtext.xtext.ecoreInference.serializer.MultiValueFeatureTestLanguageSemanticSequencer; +import org.eclipse.xtext.xtext.ecoreInference.serializer.MultiValueFeatureTestLanguageSyntacticSequencer; +import org.eclipse.xtext.xtext.ecoreInference.services.MultiValueFeatureTestLanguageGrammarAccess; /** - * Manual modifications go to {org.eclipse.xtext.xtext.ecoreInference.MultiValueFeatureTestLanguageRuntimeModule} + * Manual modifications go to {@link MultiValueFeatureTestLanguageRuntimeModule}. */ @SuppressWarnings("all") -public abstract class AbstractMultiValueFeatureTestLanguageRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule { +public abstract class AbstractMultiValueFeatureTestLanguageRuntimeModule extends DefaultRuntimeModule { protected Properties properties = null; @@ -33,64 +53,66 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeModule extends binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("multivaluefeaturetestlanguage"); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindIParser() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.MultiValueFeatureTestLanguageParser.class; + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIParser() { + return MultiValueFeatureTestLanguageParser.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindITokenToStringConverter() { - return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindITokenToStringConverter() { + return AntlrTokenToStringConverter.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindIAntlrTokenFileProvider() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.MultiValueFeatureTestLanguageAntlrTokenFileProvider.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIAntlrTokenFileProvider() { + return MultiValueFeatureTestLanguageAntlrTokenFileProvider.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindLexer() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageLexer.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindLexer() { + return InternalMultiValueFeatureTestLanguageLexer.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public com.google.inject.Provider provideInternalMultiValueFeatureTestLanguageLexer() { - return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageLexer.class); + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindITokenDefProvider() { + return AntlrTokenDefProvider.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public void configureRuntimeLexer(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageLexer.class); + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Provider provideInternalMultiValueFeatureTestLanguageLexer() { + return LexerProvider.create(InternalMultiValueFeatureTestLanguageLexer.class); } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindITokenDefProvider() { - return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public void configureRuntimeLexer(Binder binder) { + binder.bind(Lexer.class) + .annotatedWith(Names.named(LexerBindings.RUNTIME)) + .to(InternalMultiValueFeatureTestLanguageLexer.class); } - - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment - public java.lang.ClassLoader bindClassLoaderToInstance() { + + // contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 + public ClassLoader bindClassLoaderToInstance() { return getClass().getClassLoader(); } - - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment - public Class bindIGrammarAccess() { - return org.eclipse.xtext.xtext.ecoreInference.services.MultiValueFeatureTestLanguageGrammarAccess.class; + + // contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 + public Class bindIGrammarAccess() { + return MultiValueFeatureTestLanguageGrammarAccess.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISemanticSequencer() { - return org.eclipse.xtext.xtext.ecoreInference.serializer.MultiValueFeatureTestLanguageSemanticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISemanticSequencer() { + return MultiValueFeatureTestLanguageSemanticSequencer.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISyntacticSequencer() { - return org.eclipse.xtext.xtext.ecoreInference.serializer.MultiValueFeatureTestLanguageSyntacticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISyntacticSequencer() { + return MultiValueFeatureTestLanguageSyntacticSequencer.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISerializer() { - return org.eclipse.xtext.serializer.impl.Serializer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISerializer() { + return Serializer.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 b1dab3404..0b01b76fd 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 @@ -3,18 +3,38 @@ */ package org.eclipse.xtext.xtext.ecoreInference; -import java.util.Properties; - -import org.eclipse.xtext.Constants; - import com.google.inject.Binder; +import com.google.inject.Provider; import com.google.inject.name.Names; +import java.util.Properties; +import org.eclipse.xtext.Constants; +import org.eclipse.xtext.IGrammarAccess; +import org.eclipse.xtext.parser.IParser; +import org.eclipse.xtext.parser.ITokenToStringConverter; +import org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider; +import org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter; +import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider; +import org.eclipse.xtext.parser.antlr.ITokenDefProvider; +import org.eclipse.xtext.parser.antlr.Lexer; +import org.eclipse.xtext.parser.antlr.LexerBindings; +import org.eclipse.xtext.parser.antlr.LexerProvider; +import org.eclipse.xtext.serializer.ISerializer; +import org.eclipse.xtext.serializer.impl.Serializer; +import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; +import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; +import org.eclipse.xtext.service.DefaultRuntimeModule; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageAntlrTokenFileProvider; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageParser; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer; +import org.eclipse.xtext.xtext.ecoreInference.serializer.UnassignedRuleCallTestLanguageSemanticSequencer; +import org.eclipse.xtext.xtext.ecoreInference.serializer.UnassignedRuleCallTestLanguageSyntacticSequencer; +import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess; /** - * Manual modifications go to {org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageRuntimeModule} + * Manual modifications go to {@link UnassignedRuleCallTestLanguageRuntimeModule}. */ @SuppressWarnings("all") -public abstract class AbstractUnassignedRuleCallTestLanguageRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule { +public abstract class AbstractUnassignedRuleCallTestLanguageRuntimeModule extends DefaultRuntimeModule { protected Properties properties = null; @@ -33,64 +53,66 @@ public abstract class AbstractUnassignedRuleCallTestLanguageRuntimeModule extend binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("unassignedrulecalltestlanguage"); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindIParser() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageParser.class; + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIParser() { + return UnassignedRuleCallTestLanguageParser.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindITokenToStringConverter() { - return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindITokenToStringConverter() { + return AntlrTokenToStringConverter.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindIAntlrTokenFileProvider() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageAntlrTokenFileProvider.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIAntlrTokenFileProvider() { + return UnassignedRuleCallTestLanguageAntlrTokenFileProvider.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindLexer() { - return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindLexer() { + return InternalUnassignedRuleCallTestLanguageLexer.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public com.google.inject.Provider provideInternalUnassignedRuleCallTestLanguageLexer() { - return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer.class); + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindITokenDefProvider() { + return AntlrTokenDefProvider.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public void configureRuntimeLexer(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer.class); + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Provider provideInternalUnassignedRuleCallTestLanguageLexer() { + return LexerProvider.create(InternalUnassignedRuleCallTestLanguageLexer.class); } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindITokenDefProvider() { - return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public void configureRuntimeLexer(Binder binder) { + binder.bind(Lexer.class) + .annotatedWith(Names.named(LexerBindings.RUNTIME)) + .to(InternalUnassignedRuleCallTestLanguageLexer.class); } - - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment - public java.lang.ClassLoader bindClassLoaderToInstance() { + + // contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 + public ClassLoader bindClassLoaderToInstance() { return getClass().getClassLoader(); } - - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment - public Class bindIGrammarAccess() { - return org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess.class; + + // contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 + public Class bindIGrammarAccess() { + return UnassignedRuleCallTestLanguageGrammarAccess.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISemanticSequencer() { - return org.eclipse.xtext.xtext.ecoreInference.serializer.UnassignedRuleCallTestLanguageSemanticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISemanticSequencer() { + return UnassignedRuleCallTestLanguageSemanticSequencer.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISyntacticSequencer() { - return org.eclipse.xtext.xtext.ecoreInference.serializer.UnassignedRuleCallTestLanguageSyntacticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISyntacticSequencer() { + return UnassignedRuleCallTestLanguageSyntacticSequencer.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISerializer() { - return org.eclipse.xtext.serializer.impl.Serializer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISerializer() { + return Serializer.class; } - + } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.ecore index 74512bede..09a550975 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.ecore @@ -4,6 +4,6 @@ nsPrefix="multiValueFeatureTestLanguage"> + upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel index e266a86f2..4ac0611a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel @@ -1,13 +1,12 @@ + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen" + modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="MultiValueFeatureTestLanguage" + updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" + complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9"> + disposableProviderFactory="true" fileExtensions="multivaluefeaturetestlanguage" + ecorePackage="MultiValueFeatureTestLanguage.ecore#/"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetupGenerated.java index 9051bcb86..1c9750c2f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetupGenerated.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguageStandaloneSetupGenerated.java @@ -3,22 +3,22 @@ */ package org.eclipse.xtext.xtext.ecoreInference; +import com.google.inject.Guice; +import com.google.inject.Injector; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.ISetup; +import org.eclipse.xtext.common.TerminalsStandaloneSetup; +import org.eclipse.xtext.resource.IResourceFactory; +import org.eclipse.xtext.resource.IResourceServiceProvider; +import org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.MultiValueFeatureTestLanguagePackage; -import com.google.inject.Guice; -import com.google.inject.Injector; - -/** - * Generated from StandaloneSetup.xpt! - */ @SuppressWarnings("all") public class MultiValueFeatureTestLanguageStandaloneSetupGenerated implements ISetup { @Override public Injector createInjectorAndDoEMFRegistration() { - org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup(); + TerminalsStandaloneSetup.doSetup(); Injector injector = createInjector(); register(injector); @@ -26,19 +26,17 @@ public class MultiValueFeatureTestLanguageStandaloneSetupGenerated implements IS } public Injector createInjector() { - return Guice.createInjector(new org.eclipse.xtext.xtext.ecoreInference.MultiValueFeatureTestLanguageRuntimeModule()); + return Guice.createInjector(new MultiValueFeatureTestLanguageRuntimeModule()); } public void register(Injector injector) { - - org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class); - org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class); - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("multivaluefeaturetestlanguage", resourceFactory); - org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("multivaluefeaturetestlanguage", serviceProvider); + IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class); + IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class); - if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage")) { - EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage", org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.MultiValueFeatureTestLanguagePackage.eINSTANCE); - } - + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("multivaluefeaturetestlanguage", resourceFactory); + IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("multivaluefeaturetestlanguage", serviceProvider); + if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage")) { + EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2008/xtext/MultiValueFeatureTestLanguage", MultiValueFeatureTestLanguagePackage.eINSTANCE); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore index 2695a5bf9..0cdbe8c20 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore @@ -7,6 +7,6 @@ containment="true"/> - + diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel index 6ea82913d..d2e9e3f2e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel @@ -1,13 +1,12 @@ + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen" + modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="UnassignedRuleCallTestLanguage" + updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" + complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9"> + disposableProviderFactory="true" fileExtensions="unassignedrulecalltestlanguage" + ecorePackage="UnassignedRuleCallTestLanguage.ecore#/"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetupGenerated.java index 9b66fd522..9f438636b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetupGenerated.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetupGenerated.java @@ -3,22 +3,22 @@ */ package org.eclipse.xtext.xtext.ecoreInference; +import com.google.inject.Guice; +import com.google.inject.Injector; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.ISetup; +import org.eclipse.xtext.common.TerminalsStandaloneSetup; +import org.eclipse.xtext.resource.IResourceFactory; +import org.eclipse.xtext.resource.IResourceServiceProvider; +import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage; -import com.google.inject.Guice; -import com.google.inject.Injector; - -/** - * Generated from StandaloneSetup.xpt! - */ @SuppressWarnings("all") public class UnassignedRuleCallTestLanguageStandaloneSetupGenerated implements ISetup { @Override public Injector createInjectorAndDoEMFRegistration() { - org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup(); + TerminalsStandaloneSetup.doSetup(); Injector injector = createInjector(); register(injector); @@ -26,19 +26,17 @@ public class UnassignedRuleCallTestLanguageStandaloneSetupGenerated implements I } public Injector createInjector() { - return Guice.createInjector(new org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageRuntimeModule()); + return Guice.createInjector(new UnassignedRuleCallTestLanguageRuntimeModule()); } public void register(Injector injector) { - - org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class); - org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class); - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("unassignedrulecalltestlanguage", resourceFactory); - org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("unassignedrulecalltestlanguage", serviceProvider); + IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class); + IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class); - if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest")) { - EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest", org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage.eINSTANCE); - } - + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("unassignedrulecalltestlanguage", resourceFactory); + IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("unassignedrulecalltestlanguage", serviceProvider); + if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest")) { + EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest", UnassignedRuleCallTestLanguagePackage.eINSTANCE); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguageFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguageFactory.java index daadcebb9..da560f706 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguageFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguageFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguagePackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguagePackage.java index dd616c0e2..192400df4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguagePackage.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/MultiValueFeatureTestLanguagePackage.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java index 96b3ff32e..04bca09d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java index e306727a4..e470d6c3f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java index 42a34c1fb..9eb54b0b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java @@ -1,11 +1,11 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -76,9 +76,6 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple isInited = true; - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - // Create package meta-data objects theMultiValueFeatureTestLanguagePackage.createPackageContents(); @@ -172,9 +169,6 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple setNsPrefix(eNS_PREFIX); setNsURI(eNS_URI); - // Obtain other dependent packages - EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - // Create type parameters // Set bounds for type parameters @@ -183,7 +177,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple // Initialize classes and features; add operations and parameters initEClass(startEClass, Start.class, "Start", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getStart_FeatureA(), theEcorePackage.getEString(), "featureA", null, 0, -1, Start.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getStart_FeatureA(), ecorePackage.getEString(), "featureA", null, 0, -1, Start.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java index aa1ebcd0e..e75757c74 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageAdapterFactory.java index 3ec556ca9..8c6aeb3ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageAdapterFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageAdapterFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.util; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageSwitch.java index 4a60223e5..4e6c0a502 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/util/MultiValueFeatureTestLanguageSwitch.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.util; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageAntlrTokenFileProvider.java index 119884ef4..73ebb9056 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageAntlrTokenFileProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageAntlrTokenFileProvider.java @@ -7,10 +7,10 @@ import java.io.InputStream; import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider; public class MultiValueFeatureTestLanguageAntlrTokenFileProvider implements IAntlrTokenFileProvider { - + @Override public InputStream getAntlrTokenFile() { ClassLoader classLoader = getClass().getClassLoader(); - return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.tokens"); + return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.tokens"); } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageParser.java index 746d5818d..44fca48ba 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/MultiValueFeatureTestLanguageParser.java @@ -4,36 +4,37 @@ package org.eclipse.xtext.xtext.ecoreInference.parser.antlr; import com.google.inject.Inject; - +import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageParser; import org.eclipse.xtext.xtext.ecoreInference.services.MultiValueFeatureTestLanguageGrammarAccess; -public class MultiValueFeatureTestLanguageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser { - +public class MultiValueFeatureTestLanguageParser extends AbstractAntlrParser { + @Inject private MultiValueFeatureTestLanguageGrammarAccess grammarAccess; - + @Override protected void setInitialHiddenTokens(XtextTokenStream tokenStream) { tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); } + @Override - protected org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageParser createParser(XtextTokenStream stream) { - return new org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalMultiValueFeatureTestLanguageParser(stream, getGrammarAccess()); + protected InternalMultiValueFeatureTestLanguageParser createParser(XtextTokenStream stream) { + return new InternalMultiValueFeatureTestLanguageParser(stream, getGrammarAccess()); } - + @Override protected String getDefaultRuleName() { return "Start"; } - + public MultiValueFeatureTestLanguageGrammarAccess getGrammarAccess() { return this.grammarAccess; } - + public void setGrammarAccess(MultiValueFeatureTestLanguageGrammarAccess grammarAccess) { this.grammarAccess = grammarAccess; } - } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java index 3f2a9020f..d9dbfd4b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java @@ -7,10 +7,10 @@ import java.io.InputStream; import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider; public class UnassignedRuleCallTestLanguageAntlrTokenFileProvider implements IAntlrTokenFileProvider { - + @Override public InputStream getAntlrTokenFile() { ClassLoader classLoader = getClass().getClassLoader(); - return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens"); + return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens"); } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java index 9ee194891..c85b17b2e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java @@ -4,36 +4,37 @@ package org.eclipse.xtext.xtext.ecoreInference.parser.antlr; import com.google.inject.Inject; - +import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser; import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess; -public class UnassignedRuleCallTestLanguageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser { - +public class UnassignedRuleCallTestLanguageParser extends AbstractAntlrParser { + @Inject private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess; - + @Override protected void setInitialHiddenTokens(XtextTokenStream tokenStream) { tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); } + @Override - protected org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser createParser(XtextTokenStream stream) { - return new org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser(stream, getGrammarAccess()); + protected InternalUnassignedRuleCallTestLanguageParser createParser(XtextTokenStream stream) { + return new InternalUnassignedRuleCallTestLanguageParser(stream, getGrammarAccess()); } - + @Override protected String getDefaultRuleName() { return "Model"; } - + public UnassignedRuleCallTestLanguageGrammarAccess getGrammarAccess() { return this.grammarAccess; } - + public void setGrammarAccess(UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) { this.grammarAccess = grammarAccess; } - } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalMultiValueFeatureTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalMultiValueFeatureTestLanguage.g deleted file mode 100644 index 8fe527145..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalMultiValueFeatureTestLanguage.g +++ /dev/null @@ -1,71 +0,0 @@ -/* - * generated by Xtext - */ -grammar DebugInternalMultiValueFeatureTestLanguage ; - -// Rule Start -ruleStart : - RULE_ID+ -; - -RULE_ID : - '^'? ( - 'a' .. 'z' | - 'A' .. 'Z' | - '_' - ) ( - 'a' .. 'z' | - 'A' .. 'Z' | - '_' | - '0' .. '9' - )* -; - -RULE_INT : - '0' .. '9'+ -; - -RULE_STRING : - '"' ( - '\\' . | - ~ ( - '\\' | - '"' - ) - )* '"' | - '\'' ( - '\\' . | - ~ ( - '\\' | - '\'' - ) - )* '\'' -; - -RULE_ML_COMMENT : - '/*' ( - options { greedy = false ; } : . - )* '*/' { skip(); } -; - -RULE_SL_COMMENT : - '//' ~ ( - '\n' | - '\r' - )* ( - '\r'? '\n' - )? { skip(); } -; - -RULE_WS : - ( - ' ' | - '\t' | - '\r' | - '\n' - )+ { skip(); } -; - -RULE_ANY_OTHER : - . -; \ No newline at end of file diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalUnassignedRuleCallTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalUnassignedRuleCallTestLanguage.g deleted file mode 100644 index 70c44f20f..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/DebugInternalUnassignedRuleCallTestLanguage.g +++ /dev/null @@ -1,81 +0,0 @@ -/* - * generated by Xtext - */ -grammar DebugInternalUnassignedRuleCallTestLanguage ; - -// Rule Model -ruleModel : - 'model' RULE_INT+ ruleModelFeatures -; - -// Rule ModelFeatures -ruleModelFeatures : - 'feature' RULE_ID ruleDataTypeRule ';' -; - -// Rule DataTypeRule -ruleDataTypeRule : - RULE_INT 'keyword' RULE_INT RULE_STRING? -; - -RULE_ID : - '^'? ( - 'a' .. 'z' | - 'A' .. 'Z' | - '_' - ) ( - 'a' .. 'z' | - 'A' .. 'Z' | - '_' | - '0' .. '9' - )* -; - -RULE_INT : - '0' .. '9'+ -; - -RULE_STRING : - '"' ( - '\\' . | - ~ ( - '\\' | - '"' - ) - )* '"' | - '\'' ( - '\\' . | - ~ ( - '\\' | - '\'' - ) - )* '\'' -; - -RULE_ML_COMMENT : - '/*' ( - options { greedy = false ; } : . - )* '*/' { skip(); } -; - -RULE_SL_COMMENT : - '//' ~ ( - '\n' | - '\r' - )* ( - '\r'? '\n' - )? { skip(); } -; - -RULE_WS : - ( - ' ' | - '\t' | - '\r' | - '\n' - )+ { skip(); } -; - -RULE_ANY_OTHER : - . -; \ No newline at end of file diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g index 1742b9a7a..68480dec4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguage.g @@ -5,7 +5,6 @@ grammar InternalMultiValueFeatureTestLanguage; options { superClass=AbstractInternalAntlrParser; - } @lexer::header { @@ -17,7 +16,7 @@ import org.eclipse.xtext.parser.antlr.Lexer; } @parser::header { -package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; +package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -35,73 +34,67 @@ import org.eclipse.xtext.xtext.ecoreInference.services.MultiValueFeatureTestLang @parser::members { private MultiValueFeatureTestLanguageGrammarAccess grammarAccess; - + public InternalMultiValueFeatureTestLanguageParser(TokenStream input, MultiValueFeatureTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Start"; + return "Start"; } - + @Override protected MultiValueFeatureTestLanguageGrammarAccess getGrammarAccess() { return grammarAccess; } + } -@rulecatch { - catch (RecognitionException re) { - recover(input,re); +@rulecatch { + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } } - - - // Entry rule entryRuleStart -entryRuleStart returns [EObject current=null] - : +entryRuleStart returns [EObject current=null]: { newCompositeNode(grammarAccess.getStartRule()); } - iv_ruleStart=ruleStart - { $current=$iv_ruleStart.current; } - EOF -; + iv_ruleStart=ruleStart + { $current=$iv_ruleStart.current; } + EOF; // Rule Start -ruleStart returns [EObject current=null] - @init { enterRule(); - } - @after { leaveRule(); }: -( -( - lv_featureA_0_0=RULE_ID - { - newLeafNode(lv_featureA_0_0, grammarAccess.getStartAccess().getFeatureAIDTerminalRuleCall_0()); - } - { - if ($current==null) { - $current = createModelElement(grammarAccess.getStartRule()); - } - addWithLastConsumed( - $current, - "featureA", - lv_featureA_0_0, - "org.eclipse.xtext.common.Terminals.ID"); - } - -) -)+ +ruleStart returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + ( + lv_featureA_0_0=RULE_ID + { + newLeafNode(lv_featureA_0_0, grammarAccess.getStartAccess().getFeatureAIDTerminalRuleCall_0()); + } + { + if ($current==null) { + $current = createModelElement(grammarAccess.getStartRule()); + } + addWithLastConsumed( + $current, + "featureA", + lv_featureA_0_0, + "org.eclipse.xtext.common.Terminals.ID"); + } + ) + )+ ; - - - - RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; @@ -115,5 +108,3 @@ RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_ANY_OTHER : .; - - diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java index 05a188684..34bf3ef2f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageLexer.java @@ -39,10 +39,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:105:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalMultiValueFeatureTestLanguage.g:105:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalMultiValueFeatureTestLanguage.g:98:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalMultiValueFeatureTestLanguage.g:98:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalMultiValueFeatureTestLanguage.g:105:11: ( '^' )? + // InternalMultiValueFeatureTestLanguage.g:98:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -51,7 +51,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:105:11: '^' + // InternalMultiValueFeatureTestLanguage.g:98:11: '^' { match('^'); @@ -69,7 +69,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalMultiValueFeatureTestLanguage.g:105:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalMultiValueFeatureTestLanguage.g:98:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -118,10 +118,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:107:10: ( ( '0' .. '9' )+ ) - // InternalMultiValueFeatureTestLanguage.g:107:12: ( '0' .. '9' )+ + // InternalMultiValueFeatureTestLanguage.g:100:10: ( ( '0' .. '9' )+ ) + // InternalMultiValueFeatureTestLanguage.g:100:12: ( '0' .. '9' )+ { - // InternalMultiValueFeatureTestLanguage.g:107:12: ( '0' .. '9' )+ + // InternalMultiValueFeatureTestLanguage.g:100:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -135,7 +135,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:107:13: '0' .. '9' + // InternalMultiValueFeatureTestLanguage.g:100:13: '0' .. '9' { matchRange('0','9'); @@ -167,10 +167,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:109:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalMultiValueFeatureTestLanguage.g:109:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalMultiValueFeatureTestLanguage.g:102:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalMultiValueFeatureTestLanguage.g:102:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalMultiValueFeatureTestLanguage.g:109:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalMultiValueFeatureTestLanguage.g:102:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -188,10 +188,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:109:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalMultiValueFeatureTestLanguage.g:102:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalMultiValueFeatureTestLanguage.g:109:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalMultiValueFeatureTestLanguage.g:102:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -207,7 +207,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:109:21: '\\\\' . + // InternalMultiValueFeatureTestLanguage.g:102:21: '\\\\' . { match('\\'); matchAny(); @@ -215,7 +215,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } break; case 2 : - // InternalMultiValueFeatureTestLanguage.g:109:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalMultiValueFeatureTestLanguage.g:102:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -240,10 +240,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } break; case 2 : - // InternalMultiValueFeatureTestLanguage.g:109:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalMultiValueFeatureTestLanguage.g:102:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalMultiValueFeatureTestLanguage.g:109:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalMultiValueFeatureTestLanguage.g:102:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -259,7 +259,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:109:54: '\\\\' . + // InternalMultiValueFeatureTestLanguage.g:102:54: '\\\\' . { match('\\'); matchAny(); @@ -267,7 +267,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } break; case 2 : - // InternalMultiValueFeatureTestLanguage.g:109:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalMultiValueFeatureTestLanguage.g:102:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -310,12 +310,12 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:111:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalMultiValueFeatureTestLanguage.g:111:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalMultiValueFeatureTestLanguage.g:104:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalMultiValueFeatureTestLanguage.g:104:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalMultiValueFeatureTestLanguage.g:111:24: ( options {greedy=false; } : . )* + // InternalMultiValueFeatureTestLanguage.g:104:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -340,7 +340,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:111:52: . + // InternalMultiValueFeatureTestLanguage.g:104:52: . { matchAny(); @@ -370,12 +370,12 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:113:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalMultiValueFeatureTestLanguage.g:113:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalMultiValueFeatureTestLanguage.g:106:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalMultiValueFeatureTestLanguage.g:106:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalMultiValueFeatureTestLanguage.g:113:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalMultiValueFeatureTestLanguage.g:106:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -388,7 +388,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:113:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalMultiValueFeatureTestLanguage.g:106: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(); @@ -408,7 +408,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } } while (true); - // InternalMultiValueFeatureTestLanguage.g:113:40: ( ( '\\r' )? '\\n' )? + // InternalMultiValueFeatureTestLanguage.g:106:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -417,9 +417,9 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:113:41: ( '\\r' )? '\\n' + // InternalMultiValueFeatureTestLanguage.g:106:41: ( '\\r' )? '\\n' { - // InternalMultiValueFeatureTestLanguage.g:113:41: ( '\\r' )? + // InternalMultiValueFeatureTestLanguage.g:106:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -428,7 +428,7 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:113:41: '\\r' + // InternalMultiValueFeatureTestLanguage.g:106:41: '\\r' { match('\r'); @@ -460,10 +460,10 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:115:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalMultiValueFeatureTestLanguage.g:115:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalMultiValueFeatureTestLanguage.g:108:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalMultiValueFeatureTestLanguage.g:108:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalMultiValueFeatureTestLanguage.g:115:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalMultiValueFeatureTestLanguage.g:108:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -517,8 +517,8 @@ public class InternalMultiValueFeatureTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalMultiValueFeatureTestLanguage.g:117:16: ( . ) - // InternalMultiValueFeatureTestLanguage.g:117:18: . + // InternalMultiValueFeatureTestLanguage.g:110:16: ( . ) + // InternalMultiValueFeatureTestLanguage.g:110:18: . { matchAny(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageParser.java index c6830c6d3..424ae7f53 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalMultiValueFeatureTestLanguageParser.java @@ -1,4 +1,4 @@ -package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; +package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -51,18 +51,18 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna private MultiValueFeatureTestLanguageGrammarAccess grammarAccess; - + public InternalMultiValueFeatureTestLanguageParser(TokenStream input, MultiValueFeatureTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Start"; + return "Start"; } - + @Override protected MultiValueFeatureTestLanguageGrammarAccess getGrammarAccess() { return grammarAccess; @@ -70,8 +70,9 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna + // $ANTLR start "entryRuleStart" - // InternalMultiValueFeatureTestLanguage.g:67:1: entryRuleStart returns [EObject current=null] : iv_ruleStart= ruleStart EOF ; + // InternalMultiValueFeatureTestLanguage.g:64:1: entryRuleStart returns [EObject current=null] : iv_ruleStart= ruleStart EOF ; public final EObject entryRuleStart() throws RecognitionException { EObject current = null; @@ -79,8 +80,8 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna try { - // InternalMultiValueFeatureTestLanguage.g:68:2: (iv_ruleStart= ruleStart EOF ) - // InternalMultiValueFeatureTestLanguage.g:69:2: iv_ruleStart= ruleStart EOF + // InternalMultiValueFeatureTestLanguage.g:64:46: (iv_ruleStart= ruleStart EOF ) + // InternalMultiValueFeatureTestLanguage.g:65:2: iv_ruleStart= ruleStart EOF { newCompositeNode(grammarAccess.getStartRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -94,11 +95,11 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -107,19 +108,20 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna // $ANTLR start "ruleStart" - // InternalMultiValueFeatureTestLanguage.g:76:1: ruleStart returns [EObject current=null] : ( (lv_featureA_0_0= RULE_ID ) )+ ; + // InternalMultiValueFeatureTestLanguage.g:71:1: ruleStart returns [EObject current=null] : ( (lv_featureA_0_0= RULE_ID ) )+ ; public final EObject ruleStart() throws RecognitionException { EObject current = null; Token lv_featureA_0_0=null; - enterRule(); - + + enterRule(); + try { - // InternalMultiValueFeatureTestLanguage.g:79:28: ( ( (lv_featureA_0_0= RULE_ID ) )+ ) - // InternalMultiValueFeatureTestLanguage.g:80:1: ( (lv_featureA_0_0= RULE_ID ) )+ + // InternalMultiValueFeatureTestLanguage.g:77:2: ( ( (lv_featureA_0_0= RULE_ID ) )+ ) + // InternalMultiValueFeatureTestLanguage.g:78:2: ( (lv_featureA_0_0= RULE_ID ) )+ { - // InternalMultiValueFeatureTestLanguage.g:80:1: ( (lv_featureA_0_0= RULE_ID ) )+ + // InternalMultiValueFeatureTestLanguage.g:78:2: ( (lv_featureA_0_0= RULE_ID ) )+ int cnt1=0; loop1: do { @@ -133,25 +135,25 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna switch (alt1) { case 1 : - // InternalMultiValueFeatureTestLanguage.g:81:1: (lv_featureA_0_0= RULE_ID ) + // InternalMultiValueFeatureTestLanguage.g:79:3: (lv_featureA_0_0= RULE_ID ) { - // InternalMultiValueFeatureTestLanguage.g:81:1: (lv_featureA_0_0= RULE_ID ) - // InternalMultiValueFeatureTestLanguage.g:82:3: lv_featureA_0_0= RULE_ID + // InternalMultiValueFeatureTestLanguage.g:79:3: (lv_featureA_0_0= RULE_ID ) + // InternalMultiValueFeatureTestLanguage.g:80:4: lv_featureA_0_0= RULE_ID { lv_featureA_0_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_3); - newLeafNode(lv_featureA_0_0, grammarAccess.getStartAccess().getFeatureAIDTerminalRuleCall_0()); - + newLeafNode(lv_featureA_0_0, grammarAccess.getStartAccess().getFeatureAIDTerminalRuleCall_0()); + - if (current==null) { - current = createModelElement(grammarAccess.getStartRule()); - } - addWithLastConsumed( - current, - "featureA", - lv_featureA_0_0, - "org.eclipse.xtext.common.Terminals.ID"); - + if (current==null) { + current = createModelElement(grammarAccess.getStartRule()); + } + addWithLastConsumed( + current, + "featureA", + lv_featureA_0_0, + "org.eclipse.xtext.common.Terminals.ID"); + } @@ -171,13 +173,15 @@ public class InternalMultiValueFeatureTestLanguageParser extends AbstractInterna } - leaveRule(); + + leaveRule(); + } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g index 337a92f02..f8ebdefd9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g @@ -5,7 +5,6 @@ grammar InternalUnassignedRuleCallTestLanguage; options { superClass=AbstractInternalAntlrParser; - } @lexer::header { @@ -17,7 +16,7 @@ import org.eclipse.xtext.parser.antlr.Lexer; } @parser::header { -package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; +package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -35,183 +34,178 @@ import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLan @parser::members { private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess; - + public InternalUnassignedRuleCallTestLanguageParser(TokenStream input, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Model"; + return "Model"; } - + @Override protected UnassignedRuleCallTestLanguageGrammarAccess getGrammarAccess() { return grammarAccess; } + } -@rulecatch { - catch (RecognitionException re) { - recover(input,re); +@rulecatch { + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } } - - - // Entry rule entryRuleModel -entryRuleModel returns [EObject current=null] - : +entryRuleModel returns [EObject current=null]: { newCompositeNode(grammarAccess.getModelRule()); } - iv_ruleModel=ruleModel - { $current=$iv_ruleModel.current; } - EOF -; + iv_ruleModel=ruleModel + { $current=$iv_ruleModel.current; } + EOF; // Rule Model -ruleModel returns [EObject current=null] - @init { enterRule(); - } - @after { leaveRule(); }: -( otherlv_0='model' - { - newLeafNode(otherlv_0, grammarAccess.getModelAccess().getModelKeyword_0()); - } -(this_INT_1=RULE_INT - { - newLeafNode(this_INT_1, grammarAccess.getModelAccess().getINTTerminalRuleCall_1()); - } -)+( -( - { - newCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0()); - } - lv_modelFeatures_2_0=ruleModelFeatures { - if ($current==null) { - $current = createModelElementForParent(grammarAccess.getModelRule()); - } - set( - $current, - "modelFeatures", - lv_modelFeatures_2_0, - "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.ModelFeatures"); - afterParserOrEnumRuleCall(); - } - -) -)) +ruleModel returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + otherlv_0='model' + { + newLeafNode(otherlv_0, grammarAccess.getModelAccess().getModelKeyword_0()); + } + ( + this_INT_1=RULE_INT + { + newLeafNode(this_INT_1, grammarAccess.getModelAccess().getINTTerminalRuleCall_1()); + } + )+ + ( + ( + { + newCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0()); + } + lv_modelFeatures_2_0=ruleModelFeatures + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getModelRule()); + } + set( + $current, + "modelFeatures", + lv_modelFeatures_2_0, + "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.ModelFeatures"); + afterParserOrEnumRuleCall(); + } + ) + ) + ) ; - - - - // Entry rule entryRuleModelFeatures -entryRuleModelFeatures returns [EObject current=null] - : +entryRuleModelFeatures returns [EObject current=null]: { newCompositeNode(grammarAccess.getModelFeaturesRule()); } - iv_ruleModelFeatures=ruleModelFeatures - { $current=$iv_ruleModelFeatures.current; } - EOF -; + iv_ruleModelFeatures=ruleModelFeatures + { $current=$iv_ruleModelFeatures.current; } + EOF; // Rule ModelFeatures -ruleModelFeatures returns [EObject current=null] - @init { enterRule(); - } - @after { leaveRule(); }: -( otherlv_0='feature' - { - newLeafNode(otherlv_0, grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0()); - } -( -( - lv_name_1_0=RULE_ID +ruleModelFeatures returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + otherlv_0='feature' { - newLeafNode(lv_name_1_0, grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0()); + newLeafNode(otherlv_0, grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0()); } + ( + ( + lv_name_1_0=RULE_ID + { + newLeafNode(lv_name_1_0, grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0()); + } + { + if ($current==null) { + $current = createModelElement(grammarAccess.getModelFeaturesRule()); + } + setWithLastConsumed( + $current, + "name", + lv_name_1_0, + "org.eclipse.xtext.common.Terminals.ID"); + } + ) + ) { - if ($current==null) { - $current = createModelElement(grammarAccess.getModelFeaturesRule()); - } - setWithLastConsumed( - $current, - "name", - lv_name_1_0, - "org.eclipse.xtext.common.Terminals.ID"); - } - -) -) - { - newCompositeNode(grammarAccess.getModelFeaturesAccess().getDataTypeRuleParserRuleCall_2()); - } -ruleDataTypeRule - { - afterParserOrEnumRuleCall(); - } - otherlv_3=';' - { - newLeafNode(otherlv_3, grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3()); - } -) + newCompositeNode(grammarAccess.getModelFeaturesAccess().getDataTypeRuleParserRuleCall_2()); + } + ruleDataTypeRule + { + afterParserOrEnumRuleCall(); + } + otherlv_3=';' + { + newLeafNode(otherlv_3, grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3()); + } + ) ; - - - - // Entry rule entryRuleDataTypeRule -entryRuleDataTypeRule returns [String current=null] - : - { newCompositeNode(grammarAccess.getDataTypeRuleRule()); } - iv_ruleDataTypeRule=ruleDataTypeRule - { $current=$iv_ruleDataTypeRule.current.getText(); } - EOF -; +entryRuleDataTypeRule returns [String current=null]: + { newCompositeNode(grammarAccess.getDataTypeRuleRule()); } + iv_ruleDataTypeRule=ruleDataTypeRule + { $current=$iv_ruleDataTypeRule.current.getText(); } + EOF; // Rule DataTypeRule -ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] - @init { enterRule(); - } - @after { leaveRule(); }: -( this_INT_0=RULE_INT { - $current.merge(this_INT_0); - } - - { - newLeafNode(this_INT_0, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0()); - } - - kw='keyword' - { - $current.merge(kw); - newLeafNode(kw, grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1()); - } - this_INT_2=RULE_INT { - $current.merge(this_INT_2); - } - - { - newLeafNode(this_INT_2, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2()); - } -( this_STRING_3=RULE_STRING { - $current.merge(this_STRING_3); - } - - { - newLeafNode(this_STRING_3, grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3()); - } -)?) - ; - - - - +ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + this_INT_0=RULE_INT + { + $current.merge(this_INT_0); + } + { + newLeafNode(this_INT_0, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0()); + } + kw='keyword' + { + $current.merge(kw); + newLeafNode(kw, grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1()); + } + this_INT_2=RULE_INT + { + $current.merge(this_INT_2); + } + { + newLeafNode(this_INT_2, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2()); + } + ( + this_STRING_3=RULE_STRING + { + $current.merge(this_STRING_3); + } + { + newLeafNode(this_STRING_3, grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3()); + } + )? + ) +; RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; @@ -226,5 +220,3 @@ RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_ANY_OTHER : .; - - diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java index 9b59dfdb2..38c5987d8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java @@ -126,10 +126,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:216:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalUnassignedRuleCallTestLanguage.g:216:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalUnassignedRuleCallTestLanguage.g:210:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalUnassignedRuleCallTestLanguage.g:210:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalUnassignedRuleCallTestLanguage.g:216:11: ( '^' )? + // InternalUnassignedRuleCallTestLanguage.g:210:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -138,7 +138,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:216:11: '^' + // InternalUnassignedRuleCallTestLanguage.g:210:11: '^' { match('^'); @@ -156,7 +156,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalUnassignedRuleCallTestLanguage.g:216:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalUnassignedRuleCallTestLanguage.g:210:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -205,10 +205,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:218:10: ( ( '0' .. '9' )+ ) - // InternalUnassignedRuleCallTestLanguage.g:218:12: ( '0' .. '9' )+ + // InternalUnassignedRuleCallTestLanguage.g:212:10: ( ( '0' .. '9' )+ ) + // InternalUnassignedRuleCallTestLanguage.g:212:12: ( '0' .. '9' )+ { - // InternalUnassignedRuleCallTestLanguage.g:218:12: ( '0' .. '9' )+ + // InternalUnassignedRuleCallTestLanguage.g:212:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -222,7 +222,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:218:13: '0' .. '9' + // InternalUnassignedRuleCallTestLanguage.g:212:13: '0' .. '9' { matchRange('0','9'); @@ -254,10 +254,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:220:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalUnassignedRuleCallTestLanguage.g:220:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalUnassignedRuleCallTestLanguage.g:214:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalUnassignedRuleCallTestLanguage.g:214:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalUnassignedRuleCallTestLanguage.g:220:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalUnassignedRuleCallTestLanguage.g:214:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -275,10 +275,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:220:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalUnassignedRuleCallTestLanguage.g:214:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalUnassignedRuleCallTestLanguage.g:220:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalUnassignedRuleCallTestLanguage.g:214:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -294,7 +294,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:220:21: '\\\\' . + // InternalUnassignedRuleCallTestLanguage.g:214:21: '\\\\' . { match('\\'); matchAny(); @@ -302,7 +302,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } break; case 2 : - // InternalUnassignedRuleCallTestLanguage.g:220:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalUnassignedRuleCallTestLanguage.g:214:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -327,10 +327,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } break; case 2 : - // InternalUnassignedRuleCallTestLanguage.g:220:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalUnassignedRuleCallTestLanguage.g:214:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalUnassignedRuleCallTestLanguage.g:220:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalUnassignedRuleCallTestLanguage.g:214:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -346,7 +346,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:220:54: '\\\\' . + // InternalUnassignedRuleCallTestLanguage.g:214:54: '\\\\' . { match('\\'); matchAny(); @@ -354,7 +354,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } break; case 2 : - // InternalUnassignedRuleCallTestLanguage.g:220:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalUnassignedRuleCallTestLanguage.g:214:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -397,12 +397,12 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:222:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalUnassignedRuleCallTestLanguage.g:222:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalUnassignedRuleCallTestLanguage.g:216:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalUnassignedRuleCallTestLanguage.g:216:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalUnassignedRuleCallTestLanguage.g:222:24: ( options {greedy=false; } : . )* + // InternalUnassignedRuleCallTestLanguage.g:216:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -427,7 +427,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:222:52: . + // InternalUnassignedRuleCallTestLanguage.g:216:52: . { matchAny(); @@ -457,12 +457,12 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:224:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalUnassignedRuleCallTestLanguage.g:224:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalUnassignedRuleCallTestLanguage.g:218:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalUnassignedRuleCallTestLanguage.g:218:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalUnassignedRuleCallTestLanguage.g:224:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalUnassignedRuleCallTestLanguage.g:218:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -475,7 +475,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:224:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalUnassignedRuleCallTestLanguage.g:218: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(); @@ -495,7 +495,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } } while (true); - // InternalUnassignedRuleCallTestLanguage.g:224:40: ( ( '\\r' )? '\\n' )? + // InternalUnassignedRuleCallTestLanguage.g:218:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -504,9 +504,9 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:224:41: ( '\\r' )? '\\n' + // InternalUnassignedRuleCallTestLanguage.g:218:41: ( '\\r' )? '\\n' { - // InternalUnassignedRuleCallTestLanguage.g:224:41: ( '\\r' )? + // InternalUnassignedRuleCallTestLanguage.g:218:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -515,7 +515,7 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:224:41: '\\r' + // InternalUnassignedRuleCallTestLanguage.g:218:41: '\\r' { match('\r'); @@ -547,10 +547,10 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:226:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalUnassignedRuleCallTestLanguage.g:226:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUnassignedRuleCallTestLanguage.g:220:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalUnassignedRuleCallTestLanguage.g:220:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalUnassignedRuleCallTestLanguage.g:226:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUnassignedRuleCallTestLanguage.g:220:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -604,8 +604,8 @@ public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalUnassignedRuleCallTestLanguage.g:228:16: ( . ) - // InternalUnassignedRuleCallTestLanguage.g:228:18: . + // InternalUnassignedRuleCallTestLanguage.g:222:16: ( . ) + // InternalUnassignedRuleCallTestLanguage.g:222:18: . { matchAny(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java index 008bac5a9..7c8793b0d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java @@ -1,4 +1,4 @@ -package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; +package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -55,18 +55,18 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess; - + public InternalUnassignedRuleCallTestLanguageParser(TokenStream input, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Model"; + return "Model"; } - + @Override protected UnassignedRuleCallTestLanguageGrammarAccess getGrammarAccess() { return grammarAccess; @@ -74,8 +74,9 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern + // $ANTLR start "entryRuleModel" - // InternalUnassignedRuleCallTestLanguage.g:67:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // InternalUnassignedRuleCallTestLanguage.g:64:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -83,8 +84,8 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern try { - // InternalUnassignedRuleCallTestLanguage.g:68:2: (iv_ruleModel= ruleModel EOF ) - // InternalUnassignedRuleCallTestLanguage.g:69:2: iv_ruleModel= ruleModel EOF + // InternalUnassignedRuleCallTestLanguage.g:64:46: (iv_ruleModel= ruleModel EOF ) + // InternalUnassignedRuleCallTestLanguage.g:65:2: iv_ruleModel= ruleModel EOF { newCompositeNode(grammarAccess.getModelRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -98,11 +99,11 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -111,7 +112,7 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern // $ANTLR start "ruleModel" - // InternalUnassignedRuleCallTestLanguage.g:76:1: ruleModel returns [EObject current=null] : (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) ; + // InternalUnassignedRuleCallTestLanguage.g:71:1: ruleModel returns [EObject current=null] : (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -120,20 +121,21 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern EObject lv_modelFeatures_2_0 = null; - enterRule(); - + + enterRule(); + try { - // InternalUnassignedRuleCallTestLanguage.g:79:28: ( (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) ) - // InternalUnassignedRuleCallTestLanguage.g:80:1: (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) + // InternalUnassignedRuleCallTestLanguage.g:77:2: ( (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) ) + // InternalUnassignedRuleCallTestLanguage.g:78:2: (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) { - // InternalUnassignedRuleCallTestLanguage.g:80:1: (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) - // InternalUnassignedRuleCallTestLanguage.g:80:3: otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) + // InternalUnassignedRuleCallTestLanguage.g:78:2: (otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) ) + // InternalUnassignedRuleCallTestLanguage.g:79:3: otherlv_0= 'model' (this_INT_1= RULE_INT )+ ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) { otherlv_0=(Token)match(input,11,FollowSets000.FOLLOW_3); - newLeafNode(otherlv_0, grammarAccess.getModelAccess().getModelKeyword_0()); - - // InternalUnassignedRuleCallTestLanguage.g:84:1: (this_INT_1= RULE_INT )+ + newLeafNode(otherlv_0, grammarAccess.getModelAccess().getModelKeyword_0()); + + // InternalUnassignedRuleCallTestLanguage.g:83:3: (this_INT_1= RULE_INT )+ int cnt1=0; loop1: do { @@ -147,12 +149,12 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern switch (alt1) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:84:2: this_INT_1= RULE_INT + // InternalUnassignedRuleCallTestLanguage.g:84:4: this_INT_1= RULE_INT { this_INT_1=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_4); - - newLeafNode(this_INT_1, grammarAccess.getModelAccess().getINTTerminalRuleCall_1()); - + + newLeafNode(this_INT_1, grammarAccess.getModelAccess().getINTTerminalRuleCall_1()); + } break; @@ -166,31 +168,31 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern cnt1++; } while (true); - // InternalUnassignedRuleCallTestLanguage.g:88:3: ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) - // InternalUnassignedRuleCallTestLanguage.g:89:1: (lv_modelFeatures_2_0= ruleModelFeatures ) + // InternalUnassignedRuleCallTestLanguage.g:89:3: ( (lv_modelFeatures_2_0= ruleModelFeatures ) ) + // InternalUnassignedRuleCallTestLanguage.g:90:4: (lv_modelFeatures_2_0= ruleModelFeatures ) { - // InternalUnassignedRuleCallTestLanguage.g:89:1: (lv_modelFeatures_2_0= ruleModelFeatures ) - // InternalUnassignedRuleCallTestLanguage.g:90:3: lv_modelFeatures_2_0= ruleModelFeatures + // InternalUnassignedRuleCallTestLanguage.g:90:4: (lv_modelFeatures_2_0= ruleModelFeatures ) + // InternalUnassignedRuleCallTestLanguage.g:91:5: lv_modelFeatures_2_0= ruleModelFeatures { - - newCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0()); - + + newCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0()); + pushFollow(FollowSets000.FOLLOW_2); lv_modelFeatures_2_0=ruleModelFeatures(); state._fsp--; - if (current==null) { - current = createModelElementForParent(grammarAccess.getModelRule()); - } - set( - current, - "modelFeatures", - lv_modelFeatures_2_0, - "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.ModelFeatures"); - afterParserOrEnumRuleCall(); - + if (current==null) { + current = createModelElementForParent(grammarAccess.getModelRule()); + } + set( + current, + "modelFeatures", + lv_modelFeatures_2_0, + "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.ModelFeatures"); + afterParserOrEnumRuleCall(); + } @@ -203,13 +205,15 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } - leaveRule(); + + leaveRule(); + } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -218,7 +222,7 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleModelFeatures" - // InternalUnassignedRuleCallTestLanguage.g:114:1: entryRuleModelFeatures returns [EObject current=null] : iv_ruleModelFeatures= ruleModelFeatures EOF ; + // InternalUnassignedRuleCallTestLanguage.g:112:1: entryRuleModelFeatures returns [EObject current=null] : iv_ruleModelFeatures= ruleModelFeatures EOF ; public final EObject entryRuleModelFeatures() throws RecognitionException { EObject current = null; @@ -226,8 +230,8 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern try { - // InternalUnassignedRuleCallTestLanguage.g:115:2: (iv_ruleModelFeatures= ruleModelFeatures EOF ) - // InternalUnassignedRuleCallTestLanguage.g:116:2: iv_ruleModelFeatures= ruleModelFeatures EOF + // InternalUnassignedRuleCallTestLanguage.g:112:54: (iv_ruleModelFeatures= ruleModelFeatures EOF ) + // InternalUnassignedRuleCallTestLanguage.g:113:2: iv_ruleModelFeatures= ruleModelFeatures EOF { newCompositeNode(grammarAccess.getModelFeaturesRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -241,11 +245,11 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -254,7 +258,7 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern // $ANTLR start "ruleModelFeatures" - // InternalUnassignedRuleCallTestLanguage.g:123:1: ruleModelFeatures returns [EObject current=null] : (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) ; + // InternalUnassignedRuleCallTestLanguage.g:119:1: ruleModelFeatures returns [EObject current=null] : (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) ; public final EObject ruleModelFeatures() throws RecognitionException { EObject current = null; @@ -262,73 +266,76 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern Token lv_name_1_0=null; Token otherlv_3=null; - enterRule(); - + + enterRule(); + try { - // InternalUnassignedRuleCallTestLanguage.g:126:28: ( (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) ) - // InternalUnassignedRuleCallTestLanguage.g:127:1: (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) + // InternalUnassignedRuleCallTestLanguage.g:125:2: ( (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) ) + // InternalUnassignedRuleCallTestLanguage.g:126:2: (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) { - // InternalUnassignedRuleCallTestLanguage.g:127:1: (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) + // InternalUnassignedRuleCallTestLanguage.g:126:2: (otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' ) // InternalUnassignedRuleCallTestLanguage.g:127:3: otherlv_0= 'feature' ( (lv_name_1_0= RULE_ID ) ) ruleDataTypeRule otherlv_3= ';' { otherlv_0=(Token)match(input,12,FollowSets000.FOLLOW_5); - newLeafNode(otherlv_0, grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0()); - - // InternalUnassignedRuleCallTestLanguage.g:131:1: ( (lv_name_1_0= RULE_ID ) ) - // InternalUnassignedRuleCallTestLanguage.g:132:1: (lv_name_1_0= RULE_ID ) + newLeafNode(otherlv_0, grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0()); + + // InternalUnassignedRuleCallTestLanguage.g:131:3: ( (lv_name_1_0= RULE_ID ) ) + // InternalUnassignedRuleCallTestLanguage.g:132:4: (lv_name_1_0= RULE_ID ) { - // InternalUnassignedRuleCallTestLanguage.g:132:1: (lv_name_1_0= RULE_ID ) - // InternalUnassignedRuleCallTestLanguage.g:133:3: lv_name_1_0= RULE_ID + // InternalUnassignedRuleCallTestLanguage.g:132:4: (lv_name_1_0= RULE_ID ) + // InternalUnassignedRuleCallTestLanguage.g:133:5: lv_name_1_0= RULE_ID { lv_name_1_0=(Token)match(input,RULE_ID,FollowSets000.FOLLOW_3); - newLeafNode(lv_name_1_0, grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0()); + newLeafNode(lv_name_1_0, grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0()); + + + if (current==null) { + current = createModelElement(grammarAccess.getModelFeaturesRule()); + } + setWithLastConsumed( + current, + "name", + lv_name_1_0, + "org.eclipse.xtext.common.Terminals.ID"); + + + } + + + } + + + newCompositeNode(grammarAccess.getModelFeaturesAccess().getDataTypeRuleParserRuleCall_2()); - - if (current==null) { - current = createModelElement(grammarAccess.getModelFeaturesRule()); - } - setWithLastConsumed( - current, - "name", - lv_name_1_0, - "org.eclipse.xtext.common.Terminals.ID"); - - - } - - - } - - - newCompositeNode(grammarAccess.getModelFeaturesAccess().getDataTypeRuleParserRuleCall_2()); - pushFollow(FollowSets000.FOLLOW_6); ruleDataTypeRule(); state._fsp--; - - afterParserOrEnumRuleCall(); - + + afterParserOrEnumRuleCall(); + otherlv_3=(Token)match(input,13,FollowSets000.FOLLOW_2); - newLeafNode(otherlv_3, grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3()); - + newLeafNode(otherlv_3, grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3()); + } } - leaveRule(); + + leaveRule(); + } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -337,7 +344,7 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern // $ANTLR start "entryRuleDataTypeRule" - // InternalUnassignedRuleCallTestLanguage.g:169:1: entryRuleDataTypeRule returns [String current=null] : iv_ruleDataTypeRule= ruleDataTypeRule EOF ; + // InternalUnassignedRuleCallTestLanguage.g:164:1: entryRuleDataTypeRule returns [String current=null] : iv_ruleDataTypeRule= ruleDataTypeRule EOF ; public final String entryRuleDataTypeRule() throws RecognitionException { String current = null; @@ -345,8 +352,8 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern try { - // InternalUnassignedRuleCallTestLanguage.g:170:2: (iv_ruleDataTypeRule= ruleDataTypeRule EOF ) - // InternalUnassignedRuleCallTestLanguage.g:171:2: iv_ruleDataTypeRule= ruleDataTypeRule EOF + // InternalUnassignedRuleCallTestLanguage.g:164:52: (iv_ruleDataTypeRule= ruleDataTypeRule EOF ) + // InternalUnassignedRuleCallTestLanguage.g:165:2: iv_ruleDataTypeRule= ruleDataTypeRule EOF { newCompositeNode(grammarAccess.getDataTypeRuleRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -360,11 +367,11 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -373,7 +380,7 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern // $ANTLR start "ruleDataTypeRule" - // InternalUnassignedRuleCallTestLanguage.g:178:1: ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) ; + // InternalUnassignedRuleCallTestLanguage.g:171:1: ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) ; public final AntlrDatatypeRuleToken ruleDataTypeRule() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -382,35 +389,36 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern Token this_INT_2=null; Token this_STRING_3=null; - enterRule(); - + + enterRule(); + try { - // InternalUnassignedRuleCallTestLanguage.g:181:28: ( (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) ) - // InternalUnassignedRuleCallTestLanguage.g:182:1: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) + // InternalUnassignedRuleCallTestLanguage.g:177:2: ( (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) ) + // InternalUnassignedRuleCallTestLanguage.g:178:2: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) { - // InternalUnassignedRuleCallTestLanguage.g:182:1: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) - // InternalUnassignedRuleCallTestLanguage.g:182:6: this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? + // InternalUnassignedRuleCallTestLanguage.g:178:2: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) + // InternalUnassignedRuleCallTestLanguage.g:179:3: this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? { this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_7); - current.merge(this_INT_0); - - - newLeafNode(this_INT_0, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0()); - + current.merge(this_INT_0); + + + newLeafNode(this_INT_0, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0()); + kw=(Token)match(input,14,FollowSets000.FOLLOW_3); - current.merge(kw); - newLeafNode(kw, grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1()); - + current.merge(kw); + newLeafNode(kw, grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1()); + this_INT_2=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_8); - current.merge(this_INT_2); - - - newLeafNode(this_INT_2, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2()); - - // InternalUnassignedRuleCallTestLanguage.g:202:1: (this_STRING_3= RULE_STRING )? + current.merge(this_INT_2); + + + newLeafNode(this_INT_2, grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2()); + + // InternalUnassignedRuleCallTestLanguage.g:198:3: (this_STRING_3= RULE_STRING )? int alt2=2; int LA2_0 = input.LA(1); @@ -419,15 +427,15 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } switch (alt2) { case 1 : - // InternalUnassignedRuleCallTestLanguage.g:202:6: this_STRING_3= RULE_STRING + // InternalUnassignedRuleCallTestLanguage.g:199:4: this_STRING_3= RULE_STRING { this_STRING_3=(Token)match(input,RULE_STRING,FollowSets000.FOLLOW_2); - current.merge(this_STRING_3); - - - newLeafNode(this_STRING_3, grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3()); - + current.merge(this_STRING_3); + + + newLeafNode(this_STRING_3, grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3()); + } break; @@ -440,13 +448,15 @@ public class InternalUnassignedRuleCallTestLanguageParser extends AbstractIntern } - leaveRule(); + + leaveRule(); + } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java index 561411b5e..2c4bbc5c3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java @@ -3,21 +3,22 @@ */ package org.eclipse.xtext.xtext.ecoreInference.services; -import com.google.inject.Singleton; import com.google.inject.Inject; - +import com.google.inject.Singleton; import java.util.List; - -import org.eclipse.xtext.*; -import org.eclipse.xtext.service.GrammarProvider; -import org.eclipse.xtext.service.AbstractElementFinder.*; - +import org.eclipse.xtext.Assignment; +import org.eclipse.xtext.Grammar; +import org.eclipse.xtext.GrammarUtil; +import org.eclipse.xtext.ParserRule; +import org.eclipse.xtext.RuleCall; +import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; +import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.GrammarProvider; @Singleton public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarElementFinder { - public class StartElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.MultiValueFeatureTestLanguage.Start"); private final Assignment cFeatureAAssignment = (Assignment)rule.eContents().get(1); @@ -26,10 +27,10 @@ public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarE //Start: // featureA+=ID+; @Override public ParserRule getRule() { return rule; } - + //featureA+=ID+ public Assignment getFeatureAAssignment() { return cFeatureAAssignment; } - + //ID public RuleCall getFeatureAIDTerminalRuleCall_0() { return cFeatureAIDTerminalRuleCall_0; } } @@ -38,12 +39,12 @@ public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarE private final StartElements pStart; private final Grammar grammar; - + private final TerminalsGrammarAccess gaTerminals; @Inject public MultiValueFeatureTestLanguageGrammarAccess(GrammarProvider grammarProvider, - TerminalsGrammarAccess gaTerminals) { + TerminalsGrammarAccess gaTerminals) { this.grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; this.pStart = new StartElements(); @@ -70,7 +71,7 @@ public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarE return grammar; } - + public TerminalsGrammarAccess getTerminalsGrammarAccess() { return gaTerminals; } @@ -85,47 +86,47 @@ public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarE public ParserRule getStartRule() { return getStartAccess().getRule(); } - + //terminal ID: // '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*; public TerminalRule getIDRule() { return gaTerminals.getIDRule(); - } - + } + //terminal INT returns ecore::EInt: // '0'..'9'+; public TerminalRule getINTRule() { return gaTerminals.getINTRule(); - } - + } + //terminal STRING: // '"' ('\\' . | !('\\' | '"'))* '"' | // "'" ('\\' . | !('\\' | "'"))* "'"; public TerminalRule getSTRINGRule() { return gaTerminals.getSTRINGRule(); - } - + } + //terminal ML_COMMENT: // '/ *'->'* /'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); - } - + } + //terminal SL_COMMENT: // '//' !('\n' | '\r')* ('\r'? '\n')?; public TerminalRule getSL_COMMENTRule() { return gaTerminals.getSL_COMMENTRule(); - } - + } + //terminal WS: // ' ' | '\t' | '\r' | '\n'+; public TerminalRule getWSRule() { return gaTerminals.getWSRule(); - } - + } + //terminal ANY_OTHER: // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); - } + } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java index 085165d37..766d67186 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java @@ -3,21 +3,24 @@ */ package org.eclipse.xtext.xtext.ecoreInference.services; -import com.google.inject.Singleton; import com.google.inject.Inject; - +import com.google.inject.Singleton; import java.util.List; - -import org.eclipse.xtext.*; -import org.eclipse.xtext.service.GrammarProvider; -import org.eclipse.xtext.service.AbstractElementFinder.*; - +import org.eclipse.xtext.Assignment; +import org.eclipse.xtext.Grammar; +import org.eclipse.xtext.GrammarUtil; +import org.eclipse.xtext.Group; +import org.eclipse.xtext.Keyword; +import org.eclipse.xtext.ParserRule; +import org.eclipse.xtext.RuleCall; +import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; +import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.GrammarProvider; @Singleton public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammarElementFinder { - public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.Model"); private final Group cGroup = (Group)rule.eContents().get(1); @@ -29,23 +32,22 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar //Model: // 'model' INT+ modelFeatures=ModelFeatures; @Override public ParserRule getRule() { return rule; } - + //'model' INT+ modelFeatures=ModelFeatures public Group getGroup() { return cGroup; } - + //'model' public Keyword getModelKeyword_0() { return cModelKeyword_0; } - + //INT+ public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; } - + //modelFeatures=ModelFeatures public Assignment getModelFeaturesAssignment_2() { return cModelFeaturesAssignment_2; } - + //ModelFeatures public RuleCall getModelFeaturesModelFeaturesParserRuleCall_2_0() { return cModelFeaturesModelFeaturesParserRuleCall_2_0; } } - public class ModelFeaturesElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.ModelFeatures"); private final Group cGroup = (Group)rule.eContents().get(1); @@ -58,26 +60,25 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar //ModelFeatures: // 'feature' name=ID DataTypeRule ';'; @Override public ParserRule getRule() { return rule; } - + //'feature' name=ID DataTypeRule ';' public Group getGroup() { return cGroup; } - + //'feature' public Keyword getFeatureKeyword_0() { return cFeatureKeyword_0; } - + //name=ID public Assignment getNameAssignment_1() { return cNameAssignment_1; } - + //ID public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; } - + //DataTypeRule public RuleCall getDataTypeRuleParserRuleCall_2() { return cDataTypeRuleParserRuleCall_2; } - + //';' public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; } } - public class DataTypeRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.DataTypeRule"); private final Group cGroup = (Group)rule.eContents().get(1); @@ -89,19 +90,19 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar //DataTypeRule: // INT 'keyword' INT STRING?; @Override public ParserRule getRule() { return rule; } - + //INT 'keyword' INT STRING? public Group getGroup() { return cGroup; } - + //INT public RuleCall getINTTerminalRuleCall_0() { return cINTTerminalRuleCall_0; } - + //'keyword' public Keyword getKeywordKeyword_1() { return cKeywordKeyword_1; } - + //INT public RuleCall getINTTerminalRuleCall_2() { return cINTTerminalRuleCall_2; } - + //STRING? public RuleCall getSTRINGTerminalRuleCall_3() { return cSTRINGTerminalRuleCall_3; } } @@ -112,12 +113,12 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar private final DataTypeRuleElements pDataTypeRule; private final Grammar grammar; - + private final TerminalsGrammarAccess gaTerminals; @Inject public UnassignedRuleCallTestLanguageGrammarAccess(GrammarProvider grammarProvider, - TerminalsGrammarAccess gaTerminals) { + TerminalsGrammarAccess gaTerminals) { this.grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; this.pModel = new ModelElements(); @@ -146,7 +147,7 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar return grammar; } - + public TerminalsGrammarAccess getTerminalsGrammarAccess() { return gaTerminals; } @@ -161,7 +162,7 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar public ParserRule getModelRule() { return getModelAccess().getRule(); } - + //ModelFeatures: // 'feature' name=ID DataTypeRule ';'; public ModelFeaturesElements getModelFeaturesAccess() { @@ -171,7 +172,7 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar public ParserRule getModelFeaturesRule() { return getModelFeaturesAccess().getRule(); } - + //DataTypeRule: // INT 'keyword' INT STRING?; public DataTypeRuleElements getDataTypeRuleAccess() { @@ -181,47 +182,47 @@ public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammar public ParserRule getDataTypeRuleRule() { return getDataTypeRuleAccess().getRule(); } - + //terminal ID: // '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*; public TerminalRule getIDRule() { return gaTerminals.getIDRule(); - } - + } + //terminal INT returns ecore::EInt: // '0'..'9'+; public TerminalRule getINTRule() { return gaTerminals.getINTRule(); - } - + } + //terminal STRING: // '"' ('\\' . | !('\\' | '"'))* '"' | // "'" ('\\' . | !('\\' | "'"))* "'"; public TerminalRule getSTRINGRule() { return gaTerminals.getSTRINGRule(); - } - + } + //terminal ML_COMMENT: // '/ *'->'* /'; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); - } - + } + //terminal SL_COMMENT: // '//' !('\n' | '\r')* ('\r'? '\n')?; public TerminalRule getSL_COMMENTRule() { return gaTerminals.getSL_COMMENTRule(); - } - + } + //terminal WS: // ' ' | '\t' | '\r' | '\n'+; public TerminalRule getWSRule() { return gaTerminals.getWSRule(); - } - + } + //terminal ANY_OTHER: // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); - } + } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java index 357b5a240..80904361c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java index 827787c84..21e87652f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java index df4290316..3ee6ce349 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java index 6d8329821..b529683e9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java index 647f186bc..d450ca168 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java index edeb07e0b..d72b0eb94 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java index 6f226a950..8c92f04e0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java index 2988f644b..eb6e5b946 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl; @@ -6,7 +7,6 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -85,9 +85,6 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl isInited = true; - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - // Create package meta-data objects theUnassignedRuleCallTestLanguagePackage.createPackageContents(); @@ -204,9 +201,6 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl setNsPrefix(eNS_PREFIX); setNsURI(eNS_URI); - // Obtain other dependent packages - EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - // Create type parameters // Set bounds for type parameters @@ -218,7 +212,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl initEReference(getModel_ModelFeatures(), this.getModelFeatures(), null, "modelFeatures", 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(modelFeaturesEClass, ModelFeatures.class, "ModelFeatures", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getModelFeatures_Name(), theEcorePackage.getEString(), "name", null, 0, 1, ModelFeatures.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getModelFeatures_Name(), ecorePackage.getEString(), "name", null, 0, 1, ModelFeatures.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java index 0691efef0..6884e083f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java index f38030086..3eb241da5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util;