Skip to content

Commit

Permalink
Minor change to grammar to accomodate for the use of camera in display
Browse files Browse the repository at this point in the history
All the files also sport the new header.
  • Loading branch information
AlexisDrogoul committed Feb 28, 2022
1 parent d8f3072 commit ba2d137
Show file tree
Hide file tree
Showing 177 changed files with 9,841 additions and 34,071 deletions.
80 changes: 40 additions & 40 deletions msi.gama.lang.gaml/META-INF/MANIFEST.MF
@@ -1,40 +1,40 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gama Modelling Language
Bundle-Vendor: MSI
Bundle-Version: 1.8.2.qualifier
Bundle-SymbolicName: msi.gama.lang.gaml; singleton:=true
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime;bundle-version="3.2.0";resolution:=optional,
org.eclipse.core.runtime,
msi.gama.core,
org.eclipse.core.resources,
org.apache.commons.logging;resolution:=optional;visibility:=reexport,
msi.gama.ext,
org.eclipse.xtext.generator;resolution:=optional
Export-Package: msi.gama.lang.gaml,
msi.gama.lang.gaml.documentation,
msi.gama.lang.gaml.expression,
msi.gama.lang.gaml.formatting,
msi.gama.lang.gaml.gaml,
msi.gama.lang.gaml.generator,
msi.gama.lang.gaml.indexer,
msi.gama.lang.gaml.linking,
msi.gama.lang.gaml.naming,
msi.gama.lang.gaml.parser.antlr,
msi.gama.lang.gaml.parser.antlr.internal,
msi.gama.lang.gaml.parsing,
msi.gama.lang.gaml.resource,
msi.gama.lang.gaml.scoping,
msi.gama.lang.gaml.serializer,
msi.gama.lang.gaml.services,
msi.gama.lang.gaml.statements,
msi.gama.lang.gaml.validation,
msi.gama.lang.gaml.gaml.impl,
msi.gama.lang.gaml.gaml.util
Import-Package: org.apache.commons.lang;version="2.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: msi.gama.lang.gaml
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gama Modelling Language
Bundle-Vendor: MSI
Bundle-Version: 1.8.2.qualifier
Bundle-SymbolicName: msi.gama.lang.gaml; singleton:=true
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime;bundle-version="3.2.0";resolution:=optional,
org.eclipse.core.runtime,
msi.gama.core,
org.eclipse.core.resources,
org.apache.commons.logging;resolution:=optional;visibility:=reexport,
msi.gama.ext,
org.eclipse.xtext.generator;resolution:=optional
Export-Package: msi.gama.lang.gaml,
msi.gama.lang.gaml.documentation,
msi.gama.lang.gaml.expression,
msi.gama.lang.gaml.formatting,
msi.gama.lang.gaml.gaml,
msi.gama.lang.gaml.generator,
msi.gama.lang.gaml.indexer,
msi.gama.lang.gaml.linking,
msi.gama.lang.gaml.naming,
msi.gama.lang.gaml.parser.antlr,
msi.gama.lang.gaml.parser.antlr.internal,
msi.gama.lang.gaml.parsing,
msi.gama.lang.gaml.resource,
msi.gama.lang.gaml.scoping,
msi.gama.lang.gaml.serializer,
msi.gama.lang.gaml.services,
msi.gama.lang.gaml.statements,
msi.gama.lang.gaml.validation,
msi.gama.lang.gaml.gaml.impl,
msi.gama.lang.gaml.gaml.util
Import-Package: org.apache.commons.lang;version="2.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: msi.gama.lang.gaml
2 changes: 1 addition & 1 deletion msi.gama.lang.gaml/plugin.xml_gen
Expand Up @@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
<package
uri = "http://www.gama.msi/lang/gaml/Gaml"
class = "msi.gama.lang.gaml.gaml.GamlPackage"
genModel = "model/generated/Gaml.genmodel" />
Expand Down
@@ -1,13 +1,6 @@
/*******************************************************************************************************
*
* AbstractGamlRuntimeModule.java, in msi.gama.lang.gaml, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
/*
* generated by Xtext
*/
package msi.gama.lang.gaml;

import com.google.inject.Binder;
Expand Down Expand Up @@ -63,7 +56,6 @@
@SuppressWarnings("all")
public abstract class AbstractGamlRuntimeModule extends DefaultRuntimeModule {

/** The properties. */
protected Properties properties = null;

@Override
Expand All @@ -72,40 +64,20 @@ public void configure(Binder binder) {
super.configure(binder);
}

/**
* Configure language name.
*
* @param binder the binder
*/
public void configureLanguageName(Binder binder) {
binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("msi.gama.lang.gaml.Gaml");
}

/**
* Configure file extensions.
*
* @param binder the binder
*/
public void configureFileExtensions(Binder binder) {
if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("gaml,experiment");
}

/**
* Bind class loader to instance.
*
* @return the class loader
*/
// contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2
public ClassLoader bindClassLoaderToInstance() {
return getClass().getClassLoader();
}

/**
* Bind I grammar access.
*
* @return the class<? extends I grammar access>
*/
// contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2
public Class<? extends IGrammarAccess> bindIGrammarAccess() {
return GamlGrammarAccess.class;
Expand All @@ -116,11 +88,6 @@ public Class<? extends ISemanticSequencer> bindISemanticSequencer() {
return GamlSemanticSequencer.class;
}

/**
* Bind I syntactic sequencer.
*
* @return the class<? extends I syntactic sequencer>
*/
// contributed by org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2
public Class<? extends ISyntacticSequencer> bindISyntacticSequencer() {
return GamlSyntacticSequencer.class;
Expand All @@ -131,11 +98,6 @@ public Class<? extends ISerializer> bindISerializer() {
return Serializer.class;
}

/**
* Bind I parser.
*
* @return the class<? extends I parser>
*/
// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends IParser> bindIParser() {
return GamlParser.class;
Expand All @@ -146,21 +108,11 @@ public Class<? extends ITokenToStringConverter> bindITokenToStringConverter() {
return AntlrTokenToStringConverter.class;
}

/**
* Bind I antlr token file provider.
*
* @return the class<? extends I antlr token file provider>
*/
// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
return GamlAntlrTokenFileProvider.class;
}

/**
* Bind lexer.
*
* @return the class<? extends lexer>
*/
// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Class<? extends Lexer> bindLexer() {
return InternalGamlLexer.class;
Expand All @@ -171,33 +123,18 @@ public Class<? extends ITokenDefProvider> bindITokenDefProvider() {
return AntlrTokenDefProvider.class;
}

/**
* Provide internal gaml lexer.
*
* @return the provider<? extends internal gaml lexer>
*/
// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
public Provider<? extends InternalGamlLexer> provideInternalGamlLexer() {
return LexerProvider.create(InternalGamlLexer.class);
}

/**
* Configure runtime lexer.
*
* @param binder the binder
*/
// 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(InternalGamlLexer.class);
}

/**
* Bind gaml validator.
*
* @return the class<? extends gaml validator>
*/
// contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2
@SingletonBinding(eager=true)
public Class<? extends GamlValidator> bindGamlValidator() {
Expand All @@ -209,11 +146,6 @@ public Class<? extends IScopeProvider> bindIScopeProvider() {
return GamlScopeProvider.class;
}

/**
* Configure I scope provider delegate.
*
* @param binder the binder
*/
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIScopeProviderDelegate(Binder binder) {
binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(ImportedNamespaceAwareLocalScopeProvider.class);
Expand All @@ -224,11 +156,6 @@ public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
return DefaultGlobalScopeProvider.class;
}

/**
* Configure ignore case linking.
*
* @param binder the binder
*/
// contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2
public void configureIgnoreCaseLinking(Binder binder) {
binder.bindConstant().annotatedWith(IgnoreCaseLinking.class).to(false);
Expand All @@ -244,11 +171,6 @@ public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() {
return StateBasedContainerManager.class;
}

/**
* Bind I all containers state$ provider.
*
* @return the class<? extends I all containers state. provider>
*/
// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
public Class<? extends IAllContainersState.Provider> bindIAllContainersState$Provider() {
return ResourceSetBasedAllContainersStateProvider.class;
Expand All @@ -259,21 +181,11 @@ public void configureIResourceDescriptions(Binder binder) {
binder.bind(IResourceDescriptions.class).to(ResourceSetBasedResourceDescriptions.class);
}

/**
* Configure I resource descriptions persisted.
*
* @param binder the binder
*/
// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
public void configureIResourceDescriptionsPersisted(Binder binder) {
binder.bind(IResourceDescriptions.class).annotatedWith(Names.named(ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(ResourceSetBasedResourceDescriptions.class);
}

/**
* Bind I generator 2.
*
* @return the class<? extends I generator 2 >
*/
// contributed by org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2
public Class<? extends IGenerator2> bindIGenerator2() {
return GamlGenerator.class;
Expand Down
Binary file modified msi.gama.lang.gaml/src-gen/msi/gama/lang/gaml/Gaml.xtextbin
Binary file not shown.
@@ -1,13 +1,6 @@
/*******************************************************************************************************
*
* GamlStandaloneSetupGenerated.java, in msi.gama.lang.gaml, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
/*
* generated by Xtext
*/
package msi.gama.lang.gaml;

import com.google.inject.Guice;
Expand All @@ -23,9 +16,6 @@
import org.eclipse.xtext.resource.IResourceServiceProvider;
import org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl;

/**
* The Class GamlStandaloneSetupGenerated.
*/
@SuppressWarnings("all")
public class GamlStandaloneSetupGenerated implements ISetup {

Expand All @@ -49,20 +39,10 @@ public Injector createInjectorAndDoEMFRegistration() {
return injector;
}

/**
* Creates the injector.
*
* @return the injector
*/
public Injector createInjector() {
return Guice.createInjector(new GamlRuntimeModule());
}

/**
* Register.
*
* @param injector the injector
*/
public void register(Injector injector) {
if (!EPackage.Registry.INSTANCE.containsKey("http://www.gama.msi/lang/gaml/Gaml")) {
EPackage.Registry.INSTANCE.put("http://www.gama.msi/lang/gaml/Gaml", GamlPackage.eINSTANCE);
Expand Down
13 changes: 3 additions & 10 deletions msi.gama.lang.gaml/src-gen/msi/gama/lang/gaml/gaml/Access.java
@@ -1,13 +1,6 @@
/*******************************************************************************************************
*
* Access.java, in msi.gama.lang.gaml, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
/**
* generated by Xtext
*/
package msi.gama.lang.gaml.gaml;


Expand Down
@@ -1,13 +1,6 @@
/*******************************************************************************************************
*
* ActionArguments.java, in msi.gama.lang.gaml, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
/**
* generated by Xtext
*/
package msi.gama.lang.gaml.gaml;

import org.eclipse.emf.common.util.EList;
Expand Down
@@ -1,13 +1,6 @@
/*******************************************************************************************************
*
* ActionDefinition.java, in msi.gama.lang.gaml, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
/**
* generated by Xtext
*/
package msi.gama.lang.gaml.gaml;


Expand Down

0 comments on commit ba2d137

Please sign in to comment.