Migrated to higher MontiMath version.

pom.xml

@@ -16,7 +16,7 @@
         <jsr305.version>3.0.0</jsr305.version>
         <junit.version>4.11</junit.version>
         <logback.version>1.1.2</logback.version>
-        <embeddedmontiarcmath.version>0.0.12-SNAPSHOT</embeddedmontiarcmath.version>
+        <montimath.version>0.0.13</montimath.version>
 
         <!-- .. Plugins ....................................................... -->
 
@@ -113,11 +113,11 @@
 
         <!-- .. MontiCore .................................................... -->
 
-        <!-- .. EmbeddedMontiArcMath ......................................... -->
+        <!-- .. MontiMath .................................................... -->
         <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-math</artifactId>
-            <version>${embeddedmontiarcmath.version}</version>
+            <groupId>de.monticore.lang</groupId>
+            <artifactId>math</artifactId>
+            <version>${montimath.version}</version>
         </dependency>
 
 

src/main/java/de/rwth/se/mpp/montimath/MontiMathPrettyPrinter.java

 package de.rwth.se.mpp.montimath;
 
-import de.monticore.lang.math.math._symboltable.*;
-import de.monticore.lang.math.math._symboltable.expression.*;
-import de.monticore.lang.math.math._symboltable.matrix.*;
+import de.monticore.lang.math._symboltable.*;
+import de.monticore.lang.math._symboltable.expression.*;
+import de.monticore.lang.math._symboltable.matrix.*;
 import de.monticore.symboltable.Symbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathExpressionPrinter;

src/main/java/de/rwth/se/mpp/montimath/expression/AbstractMontiMathExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.monticore.symboltable.Symbol;
 import de.rwth.se.mpp.core.AbstractMathExpressionPrinter;
 import de.rwth.se.mpp.core.IndentationProvider;

src/main/java/de/rwth/se/mpp/montimath/expression/ArithmeticExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathArithmeticExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathArithmeticExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/AssignmentDeclarationExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/AssignmentExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/CompareExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathArithmeticExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathCompareExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathArithmeticExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathCompareExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/ConditionalExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathConditionalExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathConditionalExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/ConditionalsExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/ForLoopExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.MathForLoopHeadSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathForLoopExpressionSymbol;
+import de.monticore.lang.math._symboltable.MathForLoopHeadSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathForLoopExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/MathValueTypeExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathValueType;
-import de.monticore.lang.monticar.ranges._ast.ASTRange;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathValueType;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
 public class MathValueTypeExpressionPrinter extends AbstractMontiMathExpressionPrinter {
     public MathValueTypeExpressionPrinter(MathPrettyPrinter printer, IndentationProvider indentationProvider) {
@@ -50,10 +47,7 @@ public class MathValueTypeExpressionPrinter extends AbstractMontiMathExpressionP
     }
 
     protected String doPrintRange(MathValueType symbol) {
-        Optional<ASTRange> rangeOptional = symbol.getType().getRange();
-
-        if (rangeOptional.isPresent()) return rangeOptional.get().toString();
-        else return "";
+        return symbol.getType().getRange().toString();
     }
 
     protected String doPrintDimensions(List<MathExpressionSymbol> dimensions) {

src/main/java/de/rwth/se/mpp/montimath/expression/MatrixExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathExpressionPrinter;
 import de.rwth.se.mpp.core.MathPrettyPrinter;

src/main/java/de/rwth/se/mpp/montimath/expression/MontiMathExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.MathExpressionPrinter;
 
 public interface MontiMathExpressionPrinter extends MathExpressionPrinter {

src/main/java/de/rwth/se/mpp/montimath/expression/ParenthesisExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathParenthesisExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathParenthesisExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/PreOperatorExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.expression.MathPreOperatorExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathPreOperatorExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/ValueExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathExpressionPrinter;
 import de.rwth.se.mpp.core.MathPrettyPrinter;

src/main/java/de/rwth/se/mpp/montimath/expression/matrix/AbstractMontiMathMatrixExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression.matrix;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 import de.rwth.se.mpp.montimath.expression.AbstractMontiMathExpressionPrinter;

src/main/java/de/rwth/se/mpp/montimath/expression/matrix/MatrixAccessExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression.matrix;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixAccessSymbol;
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/matrix/MatrixAccessOperatorPrinter.java

 package de.rwth.se.mpp.montimath.expression.matrix;
 
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixExpressionSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;
 

src/main/java/de/rwth/se/mpp/montimath/expression/matrix/MatrixArithmeticExpressionPrinter.java

 package de.rwth.se.mpp.montimath.expression.matrix;
 
-import de.monticore.lang.math.math._symboltable.expression.MathExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixArithmeticExpressionSymbol;
-import de.monticore.lang.math.math._symboltable.matrix.MathMatrixExpressionSymbol;
+import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixArithmeticExpressionSymbol;
+import de.monticore.lang.math._symboltable.matrix.MathMatrixExpressionSymbol;
 import de.rwth.se.mpp.core.IndentationProvider;
 import de.rwth.se.mpp.core.MathPrettyPrinter;