Commit a25e1a9a authored by Evgeny Kusmenko's avatar Evgeny Kusmenko
Browse files

Merge branch 'cmake_support' into 'master'

Cmake support

See merge request !12
parents 2b437eb6 d3435848
Pipeline #71074 passed with stages
in 22 minutes and 55 seconds
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnn-arch</artifactId> <artifactId>cnn-arch</artifactId>
<version>0.2.4-SNAPSHOT</version> <version>0.2.5-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
......
...@@ -129,7 +129,6 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math, ...@@ -129,7 +129,6 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math,
| MathAssignmentStatement); | MathAssignmentStatement);
ArchComplexArithmeticExpression implements ArchArithmeticExpression = leftExpression:ArchMathExpression ArchComplexArithmeticExpression implements ArchArithmeticExpression = leftExpression:ArchMathExpression
NEWLINETOKEN*
( operator:"*" ( operator:"*"
| operator:"/" | operator:"/"
| operator:"%" | operator:"%"
...@@ -137,7 +136,6 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math, ...@@ -137,7 +136,6 @@ grammar CNNArch extends de.monticore.CommonExpressions, de.monticore.lang.Math,
| operator:"+" | operator:"+"
| operator:"-" | operator:"-"
) )
NEWLINETOKEN*
rightExpression:ArchMathExpression; rightExpression:ArchMathExpression;
TupleExpression = "(" expressions:ArchArithmeticExpression "," expressions:(ArchArithmeticExpression || ",")* ")"; TupleExpression = "(" expressions:ArchArithmeticExpression "," expressions:(ArchArithmeticExpression || ",")* ")";
......
...@@ -31,6 +31,8 @@ import java.util.Map; ...@@ -31,6 +31,8 @@ import java.util.Map;
public interface CNNArchGenerator { public interface CNNArchGenerator {
boolean isCMakeRequired();
String getGenerationTargetPath(); String getGenerationTargetPath();
void setGenerationTargetPath(String generationTargetPath); void setGenerationTargetPath(String generationTargetPath);
...@@ -46,4 +48,8 @@ public interface CNNArchGenerator { ...@@ -46,4 +48,8 @@ public interface CNNArchGenerator {
//check cocos with CNNArchCocos.checkAll(architecture) before calling this method. //check cocos with CNNArchCocos.checkAll(architecture) before calling this method.
void generateFiles(ArchitectureSymbol architecture) throws IOException; void generateFiles(ArchitectureSymbol architecture) throws IOException;
void generateCMake(String rootModelName);
Map<String, String> generateCMakeContent(String rootModelName);
} }
...@@ -25,7 +25,6 @@ import de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedVariables; ...@@ -25,7 +25,6 @@ import de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedVariables;
import de.monticore.symboltable.Scope; import de.monticore.symboltable.Scope;
import de.se_rwth.commons.logging.Log; import de.se_rwth.commons.logging.Log;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import static de.monticore.lang.monticar.cnnarch.ParserTest.ENABLE_FAIL_QUICK; import static de.monticore.lang.monticar.cnnarch.ParserTest.ENABLE_FAIL_QUICK;
......
...@@ -25,7 +25,6 @@ import de.monticore.lang.monticar.cnnarch._symboltable.CNNArchCompilationUnitSym ...@@ -25,7 +25,6 @@ import de.monticore.lang.monticar.cnnarch._symboltable.CNNArchCompilationUnitSym
import de.monticore.symboltable.Scope; import de.monticore.symboltable.Scope;
import de.se_rwth.commons.logging.Log; import de.se_rwth.commons.logging.Log;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import static de.monticore.lang.monticar.cnnarch.ParserTest.ENABLE_FAIL_QUICK; import static de.monticore.lang.monticar.cnnarch.ParserTest.ENABLE_FAIL_QUICK;
......
Supports Markdown
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