Commit d1478e92 authored by 0xJMR's avatar 0xJMR
Browse files

Migrated to higher MontiMath version.

parent a2546f38
Pipeline #53465 failed with stage
in 51 seconds
......@@ -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>
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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) {
......
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;
......
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 {
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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