Commit f07412bc authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Changes for new EMAM with MathOpt included

parent 0d7b4fd0
......@@ -30,7 +30,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-deeplearning</artifactId>
<version>0.2.4-SNAPSHOT</version>
<version>0.2.5</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......@@ -41,13 +41,13 @@
<se-commons.version>1.7.8</se-commons.version>
<mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version>
<Common-MontiCar.version>0.0.14-20180704.113055-2</Common-MontiCar.version>
<Embedded-MontiArc.version>0.1.7-SNAPSHOT</Embedded-MontiArc.version>
<Embedded-MontiArc-Math.version>0.1.4-SNAPSHOT</Embedded-MontiArc-Math.version>
<Embedded-MontiArc-MathOpt.version>0.1.3-SNAPSHOT</Embedded-MontiArc-MathOpt.version>
<Embedded-MontiArc.version>0.1.9-SNAPSHOT</Embedded-MontiArc.version>
<Embedded-MontiArc-Math.version>0.1.6-SNAPSHOT</Embedded-MontiArc-Math.version>
<Embedded-MontiArc-Behaviour.version>0.0.15-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
<CNNArch.version>0.2.7</CNNArch.version>
<Math.version>0.0.19-SNAPSHOT</Math.version>
<MathOpt.version>0.1.1-SNAPSHOT</MathOpt.version>
<embedded-montiarc-dynamics.version>0.0.2-SNAPSHOT</embedded-montiarc-dynamics.version>
<!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version>
......@@ -222,33 +222,35 @@
<dependency>
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-opt</artifactId>
<version>${Embedded-MontiArc-MathOpt.version}</version>
<artifactId>cnn-arch</artifactId>
<version>${CNNArch.version}</version>
</dependency>
<dependency>
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-opt</artifactId>
<version>${Embedded-MontiArc-MathOpt.version}</version>
<artifactId>cnn-arch</artifactId>
<version>${CNNArch.version}</version>
<classifier>${grammars.classifier}</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnn-arch</artifactId>
<version>${CNNArch.version}</version>
<artifactId>embedded-montiarc-dynamics</artifactId>
<version>${embedded-montiarc-dynamics.version}</version>
</dependency>
<dependency>
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnn-arch</artifactId>
<version>${CNNArch.version}</version>
<artifactId>embedded-montiarc-dynamics</artifactId>
<version>${embedded-montiarc-dynamics.version}</version>
<classifier>${grammars.classifier}</classifier>
<scope>provided</scope>
</dependency>
<!-- .. Test Libraries ............................................... -->
<dependency>
<groupId>junit</groupId>
......
package de.monticore.lang.monticar;
grammar EMADL extends de.monticore.lang.EmbeddedMontiArcMathOpt,
grammar EMADL extends de.monticore.lang.embeddedmontiarc.EmbeddedMontiArcMath,
de.monticore.lang.monticar.CNNArch{
start EMAMCompilationUnit;
start EMACompilationUnit;
BehaviorEmbedding = Architecture | MathStatements;
......
......@@ -20,7 +20,7 @@
*/
package de.monticore.lang.monticar.emadl._symboltable;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath._ast.ASTEMAMCompilationUnit;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTEMACompilationUnit;
import de.monticore.symboltable.ArtifactScope;
import de.monticore.symboltable.MutableScope;
import de.monticore.symboltable.ResolvingConfiguration;
......@@ -28,14 +28,14 @@ import de.monticore.symboltable.Scope;
import de.se_rwth.commons.logging.Log;
public class EMADLModelLoader extends de.monticore.modelloader.ModelingLanguageModelLoader<ASTEMAMCompilationUnit> {
public class EMADLModelLoader extends de.monticore.modelloader.ModelingLanguageModelLoader<ASTEMACompilationUnit> {
public EMADLModelLoader(EMADLLanguage language) {
super(language);
}
@Override
protected void createSymbolTableFromAST(final ASTEMAMCompilationUnit ast, final String modelName,
protected void createSymbolTableFromAST(final ASTEMACompilationUnit ast, final String modelName,
final MutableScope enclosingScope, final ResolvingConfiguration resolvingConfiguration) {
final EMADLSymbolTableCreator symbolTableCreator =
getModelingLanguage().getSymbolTableCreator(resolvingConfiguration, enclosingScope).orElse(null);
......
......@@ -20,9 +20,9 @@
*/
package de.monticore.lang.monticar.emadl._symboltable;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTEMACompilationUnit;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.EmbeddedMontiArcSymbolTableCreator;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcbehavior._symboltable.EmbeddedMontiArcBehaviorSymbolTableCreator;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath._ast.ASTEMAMCompilationUnit;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath._symboltable.EmbeddedMontiArcMathSymbolTableCreatorTOP;
import de.monticore.lang.mathopt._symboltable.MathOptSymbolTableCreator;
import de.monticore.lang.monticar.cnnarch._symboltable.CNNArchSymbolTableCreator;
......@@ -91,7 +91,7 @@ public class EMADLSymbolTableCreator extends de.monticore.symboltable.CommonSymb
*/
public Scope createFromAST(ASTEMAMCompilationUnit rootNode) {
public Scope createFromAST(ASTEMACompilationUnit rootNode) {
Log.errorIfNull(rootNode, "0xA7004_184 Error by creating of the EMADLSymbolTableCreator symbol table: top ast node is null");
rootNode.accept(visitor);
return getFirstCreatedScope();
......
......@@ -20,7 +20,7 @@
*/
package de.monticore.lang.monticar.emadl;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath._ast.ASTEMAMCompilationUnit;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTEMACompilationUnit;
import de.monticore.lang.monticar.emadl._parser.EMADLParser;
import de.se_rwth.commons.logging.Log;
import org.junit.Before;
......@@ -119,7 +119,7 @@ public class ParserTest {
Log.debug("Parsing file " + file.toString(), "ParserTest");
testCount++;
Optional<ASTEMAMCompilationUnit> model = Optional.empty();
Optional<ASTEMACompilationUnit> model = Optional.empty();
boolean expectingError = ParserTest.expectedParseErrorModels.contains(file.toString());
EMADLParser parser = new EMADLParser();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment