forked from JavaTX/JavaCompilerCore
modified: ../../src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
modified: ../../src/de/dhbwstuttgart/typeinference/constraints/Pair.java modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/RuleSet.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/PairOperator.java Einführung eines neuen Operators SMALLERNEQDOT um Ungleichungen a <!=. Number für die Relationsoperatoren einfuehren zu koennen. modified: ../../test/javFiles/Matrix.jav
This commit is contained in:
parent
34e632b872
commit
65531ac12e
@ -51,6 +51,10 @@ public class UnifyTypeFactory {
|
|||||||
return new UnifyPair(tl, tr, PairOperator.SMALLERDOT);
|
return new UnifyPair(tl, tr, PairOperator.SMALLERDOT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static UnifyPair generateSmallNotEqualDotPair(UnifyType tl, UnifyType tr){
|
||||||
|
return new UnifyPair(tl, tr, PairOperator.SMALLERNEQDOT);
|
||||||
|
}
|
||||||
|
|
||||||
public static UnifyPair generateEqualDotPair(UnifyType tl, UnifyType tr){
|
public static UnifyPair generateEqualDotPair(UnifyType tl, UnifyType tr){
|
||||||
return new UnifyPair(tl, tr, PairOperator.EQUALSDOT);
|
return new UnifyPair(tl, tr, PairOperator.EQUALSDOT);
|
||||||
}
|
}
|
||||||
@ -152,6 +156,10 @@ public class UnifyTypeFactory {
|
|||||||
UnifyPair ret = generateSmallerDotPair(UnifyTypeFactory.convert(p.TA1)
|
UnifyPair ret = generateSmallerDotPair(UnifyTypeFactory.convert(p.TA1)
|
||||||
, UnifyTypeFactory.convert(p.TA2));
|
, UnifyTypeFactory.convert(p.TA2));
|
||||||
return ret;
|
return ret;
|
||||||
|
}else if(p.GetOperator().equals(PairOperator.SMALLERNEQDOT)) {
|
||||||
|
UnifyPair ret = generateSmallNotEqualDotPair(UnifyTypeFactory.convert(p.TA1)
|
||||||
|
, UnifyTypeFactory.convert(p.TA2));
|
||||||
|
return ret;
|
||||||
}else if(p.GetOperator().equals(PairOperator.EQUALSDOT)) {
|
}else if(p.GetOperator().equals(PairOperator.EQUALSDOT)) {
|
||||||
UnifyPair ret = generateEqualDotPair(UnifyTypeFactory.convert(p.TA1)
|
UnifyPair ret = generateEqualDotPair(UnifyTypeFactory.convert(p.TA1)
|
||||||
, UnifyTypeFactory.convert(p.TA2));
|
, UnifyTypeFactory.convert(p.TA2));
|
||||||
|
@ -42,14 +42,16 @@ public class Pair implements Serializable
|
|||||||
if( TA2 != null )
|
if( TA2 != null )
|
||||||
strElement2 = TA2.toString();
|
strElement2 = TA2.toString();
|
||||||
|
|
||||||
|
/* PL ausskommentiert 2018-05-24
|
||||||
if(OperatorEqual())
|
if(OperatorEqual())
|
||||||
Operator = "=";
|
Operator = "=";
|
||||||
if(OperatorSmaller())
|
if(OperatorSmaller())
|
||||||
Operator = "<.";
|
Operator = "<.";
|
||||||
if(OperatorSmallerExtends())
|
if(OperatorSmallerExtends())
|
||||||
Operator = "<?";
|
Operator = "<?";
|
||||||
|
*/
|
||||||
|
|
||||||
return "\n(" + strElement1 + " " + Operator + " " + strElement2 + ")";
|
return "\n(" + strElement1 + " " + eOperator.toString() + " " + strElement2 + ")";
|
||||||
|
|
||||||
/*- Equals: " + bEqual*/
|
/*- Equals: " + bEqual*/
|
||||||
}
|
}
|
||||||
|
@ -272,7 +272,7 @@ public class TYPEStmt implements StatementVisitor{
|
|||||||
binary.operation.equals(BinaryExpr.Operator.BIGGEREQUAL) ||
|
binary.operation.equals(BinaryExpr.Operator.BIGGEREQUAL) ||
|
||||||
binary.operation.equals(BinaryExpr.Operator.BIGGERTHAN) ||
|
binary.operation.equals(BinaryExpr.Operator.BIGGERTHAN) ||
|
||||||
binary.operation.equals(BinaryExpr.Operator.LESSTHAN)){
|
binary.operation.equals(BinaryExpr.Operator.LESSTHAN)){
|
||||||
//eingefuegt PL 2018-05-24
|
/* //eingefuegt PL 2018-05-24
|
||||||
Set<Constraint<Pair>> numericRelationConcatenation = new HashSet<>();
|
Set<Constraint<Pair>> numericRelationConcatenation = new HashSet<>();
|
||||||
Constraint<Pair> numeric = new Constraint<>();
|
Constraint<Pair> numeric = new Constraint<>();
|
||||||
numeric.add(new Pair(binary.lexpr.getType(), bytee, PairOperator.SMALLERDOT));
|
numeric.add(new Pair(binary.lexpr.getType(), bytee, PairOperator.SMALLERDOT));
|
||||||
@ -308,6 +308,12 @@ public class TYPEStmt implements StatementVisitor{
|
|||||||
//***ACHTUNG: Moeglicherweise oder und und-Contraint falsch
|
//***ACHTUNG: Moeglicherweise oder und und-Contraint falsch
|
||||||
constraintsSet.addOderConstraint(numericRelationConcatenation);
|
constraintsSet.addOderConstraint(numericRelationConcatenation);
|
||||||
//***ACHTUNG: Moeglicherweise oder und und-Contraint falsch
|
//***ACHTUNG: Moeglicherweise oder und und-Contraint falsch
|
||||||
|
*/
|
||||||
|
//Testeise eingefuegt PL 2018-05-24
|
||||||
|
constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERNEQDOT));
|
||||||
|
constraintsSet.addUndConstraint(new Pair(binary.rexpr.getType(), number, PairOperator.SMALLERNEQDOT));
|
||||||
|
//Rückgabetyp ist Boolean
|
||||||
|
constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.SMALLERDOT));
|
||||||
|
|
||||||
//auskommentiert PL 2018-05-24
|
//auskommentiert PL 2018-05-24
|
||||||
//constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERDOT));
|
//constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERDOT));
|
||||||
|
@ -369,9 +369,13 @@ public class RuleSet implements IRuleSet{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean erase1(UnifyPair pair, IFiniteClosure fc) {
|
public boolean erase1(UnifyPair pair, IFiniteClosure fc) {
|
||||||
if(pair.getPairOp() != PairOperator.SMALLERDOT)
|
if((pair.getPairOp() != PairOperator.SMALLERDOT) && (pair.getPairOp() != PairOperator.SMALLERNEQDOT))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((pair.getPairOp() == PairOperator.SMALLERNEQDOT) && (pair.getLhsType().equals(pair.getRhsType()))) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
UnifyType lhsType = pair.getLhsType();
|
UnifyType lhsType = pair.getLhsType();
|
||||||
if(!(lhsType instanceof ReferenceType) && !(lhsType instanceof PlaceholderType))
|
if(!(lhsType instanceof ReferenceType) && !(lhsType instanceof PlaceholderType))
|
||||||
return false;
|
return false;
|
||||||
|
@ -794,10 +794,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
|
|||||||
UnifyType rhsType = pair.getRhsType();
|
UnifyType rhsType = pair.getRhsType();
|
||||||
|
|
||||||
// Case 1: (a <. Theta')
|
// Case 1: (a <. Theta')
|
||||||
if(pairOp == PairOperator.SMALLERDOT && lhsType instanceof PlaceholderType) {
|
if (((pairOp == PairOperator.SMALLERDOT) || (pairOp == PairOperator.SMALLERNEQDOT)) && lhsType instanceof PlaceholderType) {
|
||||||
//System.out.println(pair);
|
//System.out.println(pair);
|
||||||
if (first) { //writeLog(pair.toString()+"\n");
|
if (first) { //writeLog(pair.toString()+"\n");
|
||||||
Set<Set<UnifyPair>> x1 = unifyCase1(pair, fc);
|
Set<Set<UnifyPair>> x1 = unifyCase1(pair, fc);
|
||||||
|
if (pairOp == PairOperator.SMALLERNEQDOT) {
|
||||||
|
Set<UnifyType> remElem = new HashSet<>();
|
||||||
|
remElem.add(pair.getRhsType());
|
||||||
|
x1.remove(remElem);
|
||||||
|
}
|
||||||
//System.out.println(x1);
|
//System.out.println(x1);
|
||||||
result.get(0).add(x1);
|
result.get(0).add(x1);
|
||||||
if (x1.isEmpty()) {
|
if (x1.isEmpty()) {
|
||||||
@ -853,10 +858,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
|
|||||||
// result.get(3).add(unifyCase4((PlaceholderType) lhsType, rhsType, fc));
|
// result.get(3).add(unifyCase4((PlaceholderType) lhsType, rhsType, fc));
|
||||||
|
|
||||||
// Case 5: (Theta <. a)
|
// Case 5: (Theta <. a)
|
||||||
else if(pairOp == PairOperator.SMALLERDOT && rhsType instanceof PlaceholderType)
|
else if (((pairOp == PairOperator.SMALLERDOT) || (pairOp == PairOperator.SMALLERNEQDOT)) && rhsType instanceof PlaceholderType)
|
||||||
if (first) { //writeLog(pair.toString()+"\n");
|
if (first) { //writeLog(pair.toString()+"\n");
|
||||||
Set<Set<UnifyPair>> x1 = unifyCase5(pair, fc);
|
Set<Set<UnifyPair>> x1 = unifyCase5(pair, fc);
|
||||||
result.get(4).add(x1);
|
result.get(4).add(x1);
|
||||||
|
if (pairOp == PairOperator.SMALLERNEQDOT) {
|
||||||
|
Set<UnifyType> remElem = new HashSet<>();
|
||||||
|
remElem.add(pair.getLhsType());
|
||||||
|
x1.remove(remElem);
|
||||||
|
}
|
||||||
if (x1.isEmpty()) {
|
if (x1.isEmpty()) {
|
||||||
undefined.add(pair); //Theta ist nicht im FC
|
undefined.add(pair); //Theta ist nicht im FC
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,12 @@ public enum PairOperator {
|
|||||||
*/
|
*/
|
||||||
SMALLERDOT,
|
SMALLERDOT,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The smallernedot operator for arguments (T <!=. P) is the same as SMALLERDOT without
|
||||||
|
* T == P. It is used for operations + / - / * / < / > / ... with the Supertype Number
|
||||||
|
*/
|
||||||
|
SMALLERNEQDOT,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The smallerdot operator for arguments (T <.? P) is used to express that
|
* The smallerdot operator for arguments (T <.? P) is used to express that
|
||||||
* T is an element of smArg(P) (or P is an element of grArg(T)) in a CONSTRAINT
|
* T is an element of smArg(P) (or P is an element of grArg(T)) in a CONSTRAINT
|
||||||
@ -35,6 +41,7 @@ public enum PairOperator {
|
|||||||
switch (this) {
|
switch (this) {
|
||||||
case SMALLER: return "<";
|
case SMALLER: return "<";
|
||||||
case SMALLERDOT: return "<.";
|
case SMALLERDOT: return "<.";
|
||||||
|
case SMALLERNEQDOT: return "<!=.";
|
||||||
case SMALLERDOTWC: return "<.?";
|
case SMALLERDOTWC: return "<.?";
|
||||||
default: return "=."; // EQUALSDOT
|
default: return "=."; // EQUALSDOT
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user