Changeset 65 in default for v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen

Timestamp:

05/07/14 16:02:46 (10 years ago)

Author:

hkaulbersch

Message:

fixed imports

Location:

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools

Files:

• AbstractEbnfRuntimeModule.java (modified) (4 diffs)
• serializer/EbnfSyntacticSequencer.java (modified) (1 diff)
• services/EbnfGrammarAccess.java (modified) (2 diffs)
• validation/AbstractEbnfValidator.java (modified) (1 diff)

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/AbstractEbnfRuntimeModule.java

@@ -35 +35 @@
         }
         
+        // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+        public java.lang.ClassLoader bindClassLoaderToInstance() {
+                return getClass().getClassLoader();
+        }
+
         // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
         public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
@@ -102 +107 @@
         // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
         public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
-                binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);
+                binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
+        }
+
+        // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+        public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
+                return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
         }
 
@@ -110 +120 @@
         }
 
-        // contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+        // contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
         public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
-                return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;
-        }
-
-        // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-        public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
-                return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
-        }
-
-        // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-        public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
-                return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
-        }
-
-        // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-        public void configureIResourceDescriptions(com.google.inject.Binder binder) {
-                binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
-        }
-
-        // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-        public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-                binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+                return org.eclipse.xtext.naming.SimpleNameProvider.class;
         }
 
@@ -145 +135 @@
         }
 
-        // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-        public java.lang.ClassLoader bindClassLoaderToInstance() {
-                return getClass().getClassLoader();
-        }
-
-        // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-        public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-                return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-        }
-
-        // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-        public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-                return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-        }
-
-        // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-        public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-                return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-        }
-
-        // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-        public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
-                return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
-        }
-
 }

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java

@@ -77 +77 @@
          *     (
              '{' | 
+             '+' | 
              '}' | 
+             '*' | 
+             ')' | 
              '|' | 
-             '+' | 
-             '*' | 
              '[' | 
-             ']' | 
              '(' | 
-             ')'
+             ']'
          )*
          */

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/services/EbnfGrammarAccess.java

@@ -379 +379 @@
                 private final Keyword cSemicolonKeyword_4 = (Keyword)cGroup.eContents().get(4);
                 
+                ////Import: 'import' importedNamespace=FqnWithWildCard;
+                ////FqnWithWildCard: Fqn('.*')? ';';
+                ////Fqn:ID('.'ID)*;
                 //Rule:
                 //      (rulenumber=INT rulevariant=ID? ".")? name=ID "::=" definitionList=DefinitionList? ";"?;
@@ -1150 +1153 @@
         }
 
+        ////Import: 'import' importedNamespace=FqnWithWildCard;
+        ////FqnWithWildCard: Fqn('.*')? ';';
+        ////Fqn:ID('.'ID)*;
         //Rule:
         //      (rulenumber=INT rulevariant=ID? ".")? name=ID "::=" definitionList=DefinitionList? ";"?;

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/validation/AbstractEbnfValidator.java

@@ -7 +7 @@
 import java.util.List;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.validation.ComposedChecks;
 
+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
 public class AbstractEbnfValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {