From 522897c19280de40e83971901549052ead19b4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Tue, 12 Jul 2016 14:48:00 +0200 Subject: [PATCH] Generated EncodingTestLanguage --- ...ractEncodingTestLanguageRuntimeModule.java | 128 ++++++++------- .../encoding/EncodingTestLanguage.ecore | 2 +- .../encoding/EncodingTestLanguage.genmodel | 12 +- ...gTestLanguageStandaloneSetupGenerated.java | 45 +++--- .../encodingTest/EncodingTestFactory.java | 1 + .../encodingTest/EncodingTestPackage.java | 1 + .../parser/encoding/encodingTest/Model.java | 1 + .../parser/encoding/encodingTest/Word.java | 1 + .../impl/EncodingTestFactoryImpl.java | 1 + .../impl/EncodingTestPackageImpl.java | 10 +- .../encoding/encodingTest/impl/ModelImpl.java | 1 + .../encoding/encodingTest/impl/WordImpl.java | 1 + .../util/EncodingTestAdapterFactory.java | 1 + .../encodingTest/util/EncodingTestSwitch.java | 1 + ...ingTestLanguageAntlrTokenFileProvider.java | 4 +- .../antlr/EncodingTestLanguageParser.java | 21 +-- .../DebugInternalEncodingTestLanguage.g | 42 ----- .../internal/InternalEncodingTestLanguage.g | 150 ++++++++---------- .../InternalEncodingTestLanguageLexer.java | 16 +- .../InternalEncodingTestLanguageParser.java | 149 ++++++++--------- .../EncodingTestLanguageGrammarAccess.java | 38 ++--- .../xtext/GenerateAllTestLanguages.mwe2 | 1 + .../GenerateEnumRuleTestLanguage.mwe2 | 1 + .../GenerateFormatterTestLanguages.mwe2 | 1 + .../generator/ecore/SubTestLanguage.mwe2 | 1 + .../GenerateGrammarAccessTestLanguage.mwe2 | 1 + .../GenerateInheritanceLanguages.mwe2 | 3 +- .../lexer/BacktrackingLexerTestLanguage.mwe2 | 1 + .../lexer/IgnoreCaseLexerTestLanguage.mwe2 | 1 + .../linking/GenerateLinkingTestLanguages.mwe2 | 1 + .../tests/GenerateMetamodelReferencing.mwe2 | 1 + .../GenerateAntlrParserTestLanguages.mwe2 | 1 + .../GenerateAssignmentsTestLanguage.mwe2 | 1 + .../GenerateEncodingTestLanguage.mwe2 | 1 + .../GenerateFragmentTestLanguages.mwe2 | 1 + .../GenerateIndentationTestLanguages.mwe2 | 1 + .../GenerateParametersTestLanguages.mwe2 | 1 + .../GenerateTerminalrulesTestLanguages.mwe2 | 1 + .../GenerateFormatterTestLanguages.mwe2 | 1 + .../impl/CommentAssociationTestLanguage.mwe2 | 1 + .../reconstr/Bug302128TestLanguages.mwe2 | 1 + .../GenerateReconstrTestLanguages.mwe2 | 1 + .../GenerateUnassignedTextTestLanguage.mwe2 | 1 + .../resource/EObjectAtOffsetTestLanguage.mwe2 | 1 + .../GenerateSerializerLanguages.mwe2 | 1 + .../GenerateSingleTestLanguage.mwe2 | 1 + .../GenerateValidationLanguages.mwe2 | 1 + .../GenerateEcoreInferenceTestLanguages.mwe2 | 1 + 48 files changed, 329 insertions(+), 326 deletions(-) delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/DebugInternalEncodingTestLanguage.g diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java index f1ef517d0..1a3dde928 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/AbstractEncodingTestLanguageRuntimeModule.java @@ -3,18 +3,38 @@ */ package org.eclipse.xtext.parser.encoding; -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.parser.encoding.parser.antlr.EncodingTestLanguageAntlrTokenFileProvider; +import org.eclipse.xtext.parser.encoding.parser.antlr.EncodingTestLanguageParser; +import org.eclipse.xtext.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageLexer; +import org.eclipse.xtext.parser.encoding.serializer.EncodingTestLanguageSemanticSequencer; +import org.eclipse.xtext.parser.encoding.serializer.EncodingTestLanguageSyntacticSequencer; +import org.eclipse.xtext.parser.encoding.services.EncodingTestLanguageGrammarAccess; +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; /** - * Manual modifications go to {org.eclipse.xtext.parser.encoding.EncodingTestLanguageRuntimeModule} + * Manual modifications go to {@link EncodingTestLanguageRuntimeModule}. */ @SuppressWarnings("all") -public abstract class AbstractEncodingTestLanguageRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule { +public abstract class AbstractEncodingTestLanguageRuntimeModule extends DefaultRuntimeModule { protected Properties properties = null; @@ -33,64 +53,66 @@ public abstract class AbstractEncodingTestLanguageRuntimeModule extends org.ecli binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("encodingtestlanguage"); } - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindIParser() { - return org.eclipse.xtext.parser.encoding.parser.antlr.EncodingTestLanguageParser.class; + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIParser() { + return EncodingTestLanguageParser.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.parser.encoding.parser.antlr.EncodingTestLanguageAntlrTokenFileProvider.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindIAntlrTokenFileProvider() { + return EncodingTestLanguageAntlrTokenFileProvider.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class bindLexer() { - return org.eclipse.xtext.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageLexer.class; + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Class bindLexer() { + return InternalEncodingTestLanguageLexer.class; } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public com.google.inject.Provider provideInternalEncodingTestLanguageLexer() { - return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.xtext.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageLexer.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.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageLexer.class); + + // contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 + public Provider provideInternalEncodingTestLanguageLexer() { + return LexerProvider.create(InternalEncodingTestLanguageLexer.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(InternalEncodingTestLanguageLexer.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.parser.encoding.services.EncodingTestLanguageGrammarAccess.class; + + // contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 + public Class bindIGrammarAccess() { + return EncodingTestLanguageGrammarAccess.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISemanticSequencer() { - return org.eclipse.xtext.parser.encoding.serializer.EncodingTestLanguageSemanticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISemanticSequencer() { + return EncodingTestLanguageSemanticSequencer.class; } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class bindISyntacticSequencer() { - return org.eclipse.xtext.parser.encoding.serializer.EncodingTestLanguageSyntacticSequencer.class; + + // contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 + public Class bindISyntacticSequencer() { + return EncodingTestLanguageSyntacticSequencer.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/parser/encoding/EncodingTestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.ecore index af8e930d1..185e2c275 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.ecore @@ -7,6 +7,6 @@ eType="#//Word" containment="true"/> - + diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel index 59e1bc5f4..b47227db6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel @@ -1,13 +1,11 @@ + 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="EncodingTestLanguage" + updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" + complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9"> + disposableProviderFactory="true" fileExtensions="encodingtestlanguage" ecorePackage="EncodingTestLanguage.ecore#/"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetupGenerated.java index 3046d4f1c..8066ee324 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetupGenerated.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguageStandaloneSetupGenerated.java @@ -3,16 +3,19 @@ */ package org.eclipse.xtext.parser.encoding; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtext.ISetup; - 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.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.xtext.ISetup; +import org.eclipse.xtext.XtextPackage; +import org.eclipse.xtext.parser.encoding.encodingTest.EncodingTestPackage; +import org.eclipse.xtext.resource.IResourceFactory; +import org.eclipse.xtext.resource.IResourceServiceProvider; +import org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl; -/** - * Generated from StandaloneSetup.xpt! - */ @SuppressWarnings("all") public class EncodingTestLanguageStandaloneSetupGenerated implements ISetup { @@ -21,15 +24,15 @@ public class EncodingTestLanguageStandaloneSetupGenerated implements ISetup { // register default ePackages if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put( - "ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl()); + "ecore", new EcoreResourceFactoryImpl()); if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put( - "xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl()); + "xmi", new XMIResourceFactoryImpl()); if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xtextbin")) Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put( - "xtextbin", new org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl()); - if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) - EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE); + "xtextbin", new BinaryGrammarResourceFactoryImpl()); + if (!EPackage.Registry.INSTANCE.containsKey(XtextPackage.eNS_URI)) + EPackage.Registry.INSTANCE.put(XtextPackage.eNS_URI, XtextPackage.eINSTANCE); Injector injector = createInjector(); register(injector); @@ -37,19 +40,17 @@ public class EncodingTestLanguageStandaloneSetupGenerated implements ISetup { } public Injector createInjector() { - return Guice.createInjector(new org.eclipse.xtext.parser.encoding.EncodingTestLanguageRuntimeModule()); + return Guice.createInjector(new EncodingTestLanguageRuntimeModule()); } 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("encodingtestlanguage", resourceFactory); - org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("encodingtestlanguage", serviceProvider); + IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class); + IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class); - if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2010/tmf/xtext/parser/EncodingTest")) { - EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2010/tmf/xtext/parser/EncodingTest", org.eclipse.xtext.parser.encoding.encodingTest.EncodingTestPackage.eINSTANCE); - } - + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("encodingtestlanguage", resourceFactory); + IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("encodingtestlanguage", serviceProvider); + if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2010/tmf/xtext/parser/EncodingTest")) { + EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2010/tmf/xtext/parser/EncodingTest", EncodingTestPackage.eINSTANCE); + } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestFactory.java index d1b99f7cd..fd58e4b18 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestPackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestPackage.java index cae1d9d60..5a26962d0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestPackage.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/EncodingTestPackage.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java index 0738130d9..3633452b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java index ca8d75639..3f8adb7b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java index f2b1cfa8b..0f1bdfcab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java index 360be6bf2..9ab01c3f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.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 EncodingTestPackageImpl extends EPackageImpl implements EncodingTes isInited = true; - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - // Create package meta-data objects theEncodingTestPackage.createPackageContents(); @@ -204,9 +201,6 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes 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 EncodingTestPackageImpl extends EPackageImpl implements EncodingTes initEReference(getModel_Words(), this.getWord(), null, "words", 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(wordEClass, Word.class, "Word", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getWord_Value(), theEcorePackage.getEString(), "value", null, 0, 1, Word.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getWord_Value(), ecorePackage.getEString(), "value", null, 0, 1, Word.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/parser/encoding/encodingTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java index 70ef6d8bc..fab64565d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java index 0200fd9ea..1b6812449 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.impl; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestAdapterFactory.java index 169cfb3b2..263e612d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestAdapterFactory.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestAdapterFactory.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.util; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestSwitch.java index dda46c227..85eeef5fe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/util/EncodingTestSwitch.java @@ -1,4 +1,5 @@ /** + * generated by Xtext */ package org.eclipse.xtext.parser.encoding.encodingTest.util; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageAntlrTokenFileProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageAntlrTokenFileProvider.java index b972120a0..f61648495 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageAntlrTokenFileProvider.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageAntlrTokenFileProvider.java @@ -7,10 +7,10 @@ import java.io.InputStream; import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider; public class EncodingTestLanguageAntlrTokenFileProvider implements IAntlrTokenFileProvider { - + @Override public InputStream getAntlrTokenFile() { ClassLoader classLoader = getClass().getClassLoader(); - return classLoader.getResourceAsStream("org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.tokens"); + return classLoader.getResourceAsStream("org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.tokens"); } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageParser.java index 204bf75d1..ac40c9349 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/EncodingTestLanguageParser.java @@ -4,36 +4,37 @@ package org.eclipse.xtext.parser.encoding.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.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageParser; import org.eclipse.xtext.parser.encoding.services.EncodingTestLanguageGrammarAccess; -public class EncodingTestLanguageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser { - +public class EncodingTestLanguageParser extends AbstractAntlrParser { + @Inject private EncodingTestLanguageGrammarAccess grammarAccess; - + @Override protected void setInitialHiddenTokens(XtextTokenStream tokenStream) { tokenStream.setInitialHiddenTokens("RULE_WS"); } + @Override - protected org.eclipse.xtext.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageParser createParser(XtextTokenStream stream) { - return new org.eclipse.xtext.parser.encoding.parser.antlr.internal.InternalEncodingTestLanguageParser(stream, getGrammarAccess()); + protected InternalEncodingTestLanguageParser createParser(XtextTokenStream stream) { + return new InternalEncodingTestLanguageParser(stream, getGrammarAccess()); } - + @Override protected String getDefaultRuleName() { return "Model"; } - + public EncodingTestLanguageGrammarAccess getGrammarAccess() { return this.grammarAccess; } - + public void setGrammarAccess(EncodingTestLanguageGrammarAccess grammarAccess) { this.grammarAccess = grammarAccess; } - } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/DebugInternalEncodingTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/DebugInternalEncodingTestLanguage.g deleted file mode 100644 index 155cafc9f..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/DebugInternalEncodingTestLanguage.g +++ /dev/null @@ -1,42 +0,0 @@ -/* - * generated by Xtext - */ -grammar DebugInternalEncodingTestLanguage ; - -// Rule Model -ruleModel : - ruleWord* -; - -// Rule Word -ruleWord : - RULE_LEXEME -; - -RULE_LEXEME : - ( - 'a' .. 'z' | - 'A' .. 'Z' | - '0' .. '9' | - '\u00E4' | - '\u00F6' | - '\u00FC' | - '\u00DF' | - '\u00C4' | - '\u00D6' | - '\u00DC' - )* -; - -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/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.g index a77bee31c..04542c43a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguage.g @@ -5,7 +5,6 @@ grammar InternalEncodingTestLanguage; options { superClass=AbstractInternalAntlrParser; - } @lexer::header { @@ -17,7 +16,7 @@ import org.eclipse.xtext.parser.antlr.Lexer; } @parser::header { -package org.eclipse.xtext.parser.encoding.parser.antlr.internal; +package org.eclipse.xtext.parser.encoding.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -35,116 +34,105 @@ import org.eclipse.xtext.parser.encoding.services.EncodingTestLanguageGrammarAcc @parser::members { private EncodingTestLanguageGrammarAccess grammarAccess; - + public InternalEncodingTestLanguageParser(TokenStream input, EncodingTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Model"; + return "Model"; } - + @Override protected EncodingTestLanguageGrammarAccess 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(); }: -( -( - { - newCompositeNode(grammarAccess.getModelAccess().getWordsWordParserRuleCall_0()); - } - lv_words_0_0=ruleWord { - if ($current==null) { - $current = createModelElementForParent(grammarAccess.getModelRule()); - } - add( - $current, - "words", - lv_words_0_0, - "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Word"); - afterParserOrEnumRuleCall(); - } - -) -)* +ruleModel returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + ( + { + newCompositeNode(grammarAccess.getModelAccess().getWordsWordParserRuleCall_0()); + } + lv_words_0_0=ruleWord + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getModelRule()); + } + add( + $current, + "words", + lv_words_0_0, + "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Word"); + afterParserOrEnumRuleCall(); + } + ) + )* ; - - - - // Entry rule entryRuleWord -entryRuleWord returns [EObject current=null] - : +entryRuleWord returns [EObject current=null]: { newCompositeNode(grammarAccess.getWordRule()); } - iv_ruleWord=ruleWord - { $current=$iv_ruleWord.current; } - EOF -; + iv_ruleWord=ruleWord + { $current=$iv_ruleWord.current; } + EOF; // Rule Word -ruleWord returns [EObject current=null] - @init { enterRule(); - } - @after { leaveRule(); }: -( -( - lv_value_0_0=RULE_LEXEME - { - newLeafNode(lv_value_0_0, grammarAccess.getWordAccess().getValueLEXEMETerminalRuleCall_0()); - } - { - if ($current==null) { - $current = createModelElement(grammarAccess.getWordRule()); - } - setWithLastConsumed( - $current, - "value", - lv_value_0_0, - "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.LEXEME"); - } - -) -) +ruleWord returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + ( + lv_value_0_0=RULE_LEXEME + { + newLeafNode(lv_value_0_0, grammarAccess.getWordAccess().getValueLEXEMETerminalRuleCall_0()); + } + { + if ($current==null) { + $current = createModelElement(grammarAccess.getWordRule()); + } + setWithLastConsumed( + $current, + "value", + lv_value_0_0, + "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.LEXEME"); + } + ) + ) ; - - - - RULE_LEXEME : ('a'..'z'|'A'..'Z'|'0'..'9'|'\u00E4'|'\u00F6'|'\u00FC'|'\u00DF'|'\u00C4'|'\u00D6'|'\u00DC')*; RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_ANY_OTHER : .; - - diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageLexer.java index 79905b66c..5544030fd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageLexer.java @@ -35,10 +35,10 @@ public class InternalEncodingTestLanguageLexer extends Lexer { try { int _type = RULE_LEXEME; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalEncodingTestLanguage.g:144:13: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* ) - // InternalEncodingTestLanguage.g:144:15: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* + // InternalEncodingTestLanguage.g:134:13: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* ) + // InternalEncodingTestLanguage.g:134:15: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* { - // InternalEncodingTestLanguage.g:144:15: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* + // InternalEncodingTestLanguage.g:134:15: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\\u00E4' | '\\u00F6' | '\\u00FC' | '\\u00DF' | '\\u00C4' | '\\u00D6' | '\\u00DC' )* loop1: do { int alt1=2; @@ -87,10 +87,10 @@ public class InternalEncodingTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalEncodingTestLanguage.g:146:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalEncodingTestLanguage.g:146:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalEncodingTestLanguage.g:136:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalEncodingTestLanguage.g:136:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalEncodingTestLanguage.g:146:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalEncodingTestLanguage.g:136:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt2=0; loop2: do { @@ -144,8 +144,8 @@ public class InternalEncodingTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalEncodingTestLanguage.g:148:16: ( . ) - // InternalEncodingTestLanguage.g:148:18: . + // InternalEncodingTestLanguage.g:138:16: ( . ) + // InternalEncodingTestLanguage.g:138:18: . { matchAny(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageParser.java index 6028c3ddb..a68f4e171 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/parser/antlr/internal/InternalEncodingTestLanguageParser.java @@ -1,4 +1,4 @@ -package org.eclipse.xtext.parser.encoding.parser.antlr.internal; +package org.eclipse.xtext.parser.encoding.parser.antlr.internal; import org.eclipse.xtext.*; import org.eclipse.xtext.parser.*; @@ -47,18 +47,18 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar private EncodingTestLanguageGrammarAccess grammarAccess; - + public InternalEncodingTestLanguageParser(TokenStream input, EncodingTestLanguageGrammarAccess grammarAccess) { this(input); this.grammarAccess = grammarAccess; registerRules(grammarAccess.getGrammar()); } - + @Override protected String getFirstRuleName() { - return "Model"; + return "Model"; } - + @Override protected EncodingTestLanguageGrammarAccess getGrammarAccess() { return grammarAccess; @@ -66,8 +66,9 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar + // $ANTLR start "entryRuleModel" - // InternalEncodingTestLanguage.g:67:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // InternalEncodingTestLanguage.g:64:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -75,8 +76,8 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar try { - // InternalEncodingTestLanguage.g:68:2: (iv_ruleModel= ruleModel EOF ) - // InternalEncodingTestLanguage.g:69:2: iv_ruleModel= ruleModel EOF + // InternalEncodingTestLanguage.g:64:46: (iv_ruleModel= ruleModel EOF ) + // InternalEncodingTestLanguage.g:65:2: iv_ruleModel= ruleModel EOF { newCompositeNode(grammarAccess.getModelRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -90,11 +91,11 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -103,20 +104,21 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start "ruleModel" - // InternalEncodingTestLanguage.g:76:1: ruleModel returns [EObject current=null] : ( (lv_words_0_0= ruleWord ) )* ; + // InternalEncodingTestLanguage.g:71:1: ruleModel returns [EObject current=null] : ( (lv_words_0_0= ruleWord ) )* ; public final EObject ruleModel() throws RecognitionException { EObject current = null; EObject lv_words_0_0 = null; - enterRule(); - + + enterRule(); + try { - // InternalEncodingTestLanguage.g:79:28: ( ( (lv_words_0_0= ruleWord ) )* ) - // InternalEncodingTestLanguage.g:80:1: ( (lv_words_0_0= ruleWord ) )* + // InternalEncodingTestLanguage.g:77:2: ( ( (lv_words_0_0= ruleWord ) )* ) + // InternalEncodingTestLanguage.g:78:2: ( (lv_words_0_0= ruleWord ) )* { - // InternalEncodingTestLanguage.g:80:1: ( (lv_words_0_0= ruleWord ) )* + // InternalEncodingTestLanguage.g:78:2: ( (lv_words_0_0= ruleWord ) )* loop1: do { int alt1=2; @@ -129,30 +131,30 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar switch (alt1) { case 1 : - // InternalEncodingTestLanguage.g:81:1: (lv_words_0_0= ruleWord ) + // InternalEncodingTestLanguage.g:79:3: (lv_words_0_0= ruleWord ) { - // InternalEncodingTestLanguage.g:81:1: (lv_words_0_0= ruleWord ) - // InternalEncodingTestLanguage.g:82:3: lv_words_0_0= ruleWord + // InternalEncodingTestLanguage.g:79:3: (lv_words_0_0= ruleWord ) + // InternalEncodingTestLanguage.g:80:4: lv_words_0_0= ruleWord { - - newCompositeNode(grammarAccess.getModelAccess().getWordsWordParserRuleCall_0()); - + + newCompositeNode(grammarAccess.getModelAccess().getWordsWordParserRuleCall_0()); + pushFollow(FollowSets000.FOLLOW_3); lv_words_0_0=ruleWord(); state._fsp--; - if (current==null) { - current = createModelElementForParent(grammarAccess.getModelRule()); - } - add( - current, - "words", - lv_words_0_0, - "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Word"); - afterParserOrEnumRuleCall(); - + if (current==null) { + current = createModelElementForParent(grammarAccess.getModelRule()); + } + add( + current, + "words", + lv_words_0_0, + "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Word"); + afterParserOrEnumRuleCall(); + } @@ -168,13 +170,15 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar } - leaveRule(); + + leaveRule(); + } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -183,7 +187,7 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start "entryRuleWord" - // InternalEncodingTestLanguage.g:106:1: entryRuleWord returns [EObject current=null] : iv_ruleWord= ruleWord EOF ; + // InternalEncodingTestLanguage.g:100:1: entryRuleWord returns [EObject current=null] : iv_ruleWord= ruleWord EOF ; public final EObject entryRuleWord() throws RecognitionException { EObject current = null; @@ -191,8 +195,8 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar try { - // InternalEncodingTestLanguage.g:107:2: (iv_ruleWord= ruleWord EOF ) - // InternalEncodingTestLanguage.g:108:2: iv_ruleWord= ruleWord EOF + // InternalEncodingTestLanguage.g:100:45: (iv_ruleWord= ruleWord EOF ) + // InternalEncodingTestLanguage.g:101:2: iv_ruleWord= ruleWord EOF { newCompositeNode(grammarAccess.getWordRule()); pushFollow(FollowSets000.FOLLOW_1); @@ -206,11 +210,11 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar } } - - catch (RecognitionException re) { - recover(input,re); + + catch (RecognitionException re) { + recover(input,re); appendSkippedTokens(); - } + } finally { } return current; @@ -219,38 +223,39 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start "ruleWord" - // InternalEncodingTestLanguage.g:115:1: ruleWord returns [EObject current=null] : ( (lv_value_0_0= RULE_LEXEME ) ) ; + // InternalEncodingTestLanguage.g:107:1: ruleWord returns [EObject current=null] : ( (lv_value_0_0= RULE_LEXEME ) ) ; public final EObject ruleWord() throws RecognitionException { EObject current = null; Token lv_value_0_0=null; - enterRule(); - + + enterRule(); + try { - // InternalEncodingTestLanguage.g:118:28: ( ( (lv_value_0_0= RULE_LEXEME ) ) ) - // InternalEncodingTestLanguage.g:119:1: ( (lv_value_0_0= RULE_LEXEME ) ) + // InternalEncodingTestLanguage.g:113:2: ( ( (lv_value_0_0= RULE_LEXEME ) ) ) + // InternalEncodingTestLanguage.g:114:2: ( (lv_value_0_0= RULE_LEXEME ) ) { - // InternalEncodingTestLanguage.g:119:1: ( (lv_value_0_0= RULE_LEXEME ) ) - // InternalEncodingTestLanguage.g:120:1: (lv_value_0_0= RULE_LEXEME ) + // InternalEncodingTestLanguage.g:114:2: ( (lv_value_0_0= RULE_LEXEME ) ) + // InternalEncodingTestLanguage.g:115:3: (lv_value_0_0= RULE_LEXEME ) { - // InternalEncodingTestLanguage.g:120:1: (lv_value_0_0= RULE_LEXEME ) - // InternalEncodingTestLanguage.g:121:3: lv_value_0_0= RULE_LEXEME + // InternalEncodingTestLanguage.g:115:3: (lv_value_0_0= RULE_LEXEME ) + // InternalEncodingTestLanguage.g:116:4: lv_value_0_0= RULE_LEXEME { lv_value_0_0=(Token)match(input,RULE_LEXEME,FollowSets000.FOLLOW_2); - newLeafNode(lv_value_0_0, grammarAccess.getWordAccess().getValueLEXEMETerminalRuleCall_0()); - + newLeafNode(lv_value_0_0, grammarAccess.getWordAccess().getValueLEXEMETerminalRuleCall_0()); + - if (current==null) { - current = createModelElement(grammarAccess.getWordRule()); - } - setWithLastConsumed( - current, - "value", - lv_value_0_0, - "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.LEXEME"); - + if (current==null) { + current = createModelElement(grammarAccess.getWordRule()); + } + setWithLastConsumed( + current, + "value", + lv_value_0_0, + "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.LEXEME"); + } @@ -260,13 +265,15 @@ public class InternalEncodingTestLanguageParser extends AbstractInternalAntlrPar } - 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/parser/encoding/services/EncodingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java index 41492cb08..01ef8726e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java @@ -3,20 +3,21 @@ */ package org.eclipse.xtext.parser.encoding.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.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.service.AbstractElementFinder.AbstractGrammarElementFinder; import org.eclipse.xtext.service.GrammarProvider; -import org.eclipse.xtext.service.AbstractElementFinder.*; - @Singleton public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFinder { - public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Model"); private final Assignment cWordsAssignment = (Assignment)rule.eContents().get(1); @@ -25,14 +26,13 @@ public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFin //Model: // words+=Word*; @Override public ParserRule getRule() { return rule; } - + //words+=Word* public Assignment getWordsAssignment() { return cWordsAssignment; } - + //Word public RuleCall getWordsWordParserRuleCall_0() { return cWordsWordParserRuleCall_0; } } - public class WordElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Word"); private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1); @@ -41,10 +41,10 @@ public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFin //Word: // value=LEXEME; @Override public ParserRule getRule() { return rule; } - + //value=LEXEME public Assignment getValueAssignment() { return cValueAssignment; } - + //LEXEME public RuleCall getValueLEXEMETerminalRuleCall_0() { return cValueLEXEMETerminalRuleCall_0; } } @@ -100,7 +100,7 @@ public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFin public ParserRule getModelRule() { return getModelAccess().getRule(); } - + //Word: // value=LEXEME; public WordElements getWordAccess() { @@ -110,22 +110,22 @@ public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFin public ParserRule getWordRule() { return getWordAccess().getRule(); } - + //terminal LEXEME: // 'a'..'z' | 'A'..'Z' | '0'..'9' | 'ä' | 'ö' | 'ü' | 'ß' | 'Ä' | 'Ö' | 'Ü'*; public TerminalRule getLEXEMERule() { return tLEXEME; - } - + } + //terminal WS: // ' ' | '\t' | '\r' | '\n'+; public TerminalRule getWSRule() { return tWS; - } - + } + //terminal ANY_OTHER: // .; public TerminalRule getANY_OTHERRule() { return tANY_OTHER; - } + } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 index 44ed4470b..b1ecacd27 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 @@ -75,6 +75,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 index 8e22801e8..6d2ab8f47 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GenerateEnumRuleTestLanguage.mwe2 @@ -36,6 +36,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 index 333990f92..968c2352a 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/internal/GenerateFormatterTestLanguages.mwe2 @@ -41,6 +41,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 index 8c06e5830..f6fe92a5b 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.mwe2 @@ -31,6 +31,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 index bac04615e..b6cd1c88e 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/grammarAccess/GenerateGrammarAccessTestLanguage.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 index 00ce9e15c..19576f038 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/GenerateInheritanceLanguages.mwe2 @@ -15,7 +15,6 @@ import org.eclipse.xtext.xtext.generator.* var projectName = "org.eclipse.xtext.tests" var runtimeProject = "../${projectName}" var lineDelimiter = '\n' -var encoding = 'ISO-8859-1' Workflow { bean = StandaloneSetup { @@ -52,8 +51,8 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter - encoding = encoding preferXtendStubs = false } } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 index 489820a5e..3e3dc8696 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 index 914d2a633..e0332c4da 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.mwe2 @@ -36,6 +36,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 index b50c5a021..8704460a6 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 @@ -41,6 +41,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 index 23f5b712f..deeec444a 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/metamodelreferencing/tests/GenerateMetamodelReferencing.mwe2 @@ -47,6 +47,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 index d52546462..08a7a2041 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/GenerateAntlrParserTestLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 index bda1d0e62..ada22a2ee 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/assignments/GenerateAssignmentsTestLanguage.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 index dea789489..198cc0348 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/encoding/GenerateEncodingTestLanguage.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 index 03a23fcc7..2cd5ffea5 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/GenerateFragmentTestLanguages.mwe2 @@ -46,6 +46,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 index 975ec9480..f632abdc8 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/GenerateIndentationTestLanguages.mwe2 @@ -41,6 +41,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 index f3ac4be3e..54ac2c9a6 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/GenerateParametersTestLanguages.mwe2 @@ -45,6 +45,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 index 8d6e6fb59..7c15ab6a0 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/terminalrules/GenerateTerminalrulesTestLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 index e15990c8e..9224fffe1 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/GenerateFormatterTestLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 index fe36cb4d6..c5692981a 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.mwe2 @@ -29,6 +29,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 index ccc09c800..1938fbd57 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguages.mwe2 @@ -29,6 +29,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 index ddf2b1019..a6771d52d 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/GenerateReconstrTestLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 index c7d2485f3..450f314fd 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/GenerateUnassignedTextTestLanguage.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 index 401b0e044..51d2b1058 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.mwe2 @@ -37,6 +37,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 index 821a6ef5f..a59e2ffb0 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenerateSerializerLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 index ff703cf30..b955390b8 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/testlanguages/GenerateSingleTestLanguage.mwe2 @@ -48,6 +48,7 @@ Workflow { } } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 index 6716ca879..e748185c8 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/GenerateValidationLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 index 704d3e092..59a3a4729 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/GenerateEcoreInferenceTestLanguages.mwe2 @@ -35,6 +35,7 @@ Workflow { rootPath = ".." } code = { + encoding = 'ISO-8859-1' lineDelimiter = lineDelimiter preferXtendStubs = false }