i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

adapt

Browse Source
This commit is contained in:
Florian Steurer 2015-11-14 18:51:46 +01:00
parent 82c0736fee
commit 3739747eca
8 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/dhbwstuttgart/typeinference/unifynew/RuleSet.java
View File

@ -340,7 +340,7 @@ public class RuleSet implements IRuleSet{
for(int i = 0; i < lhsTypeParams.size(); i++) for(int i = 0; i < lhsTypeParams.size(); i++)
unif.andThen(new Unifier(lhsFromFcTypeParams.get(i), lhsTypeParams.get(i))); unif.andThen(new Unifier(lhsFromFcTypeParams.get(i), lhsTypeParams.get(i)));
return Optional.of(new MPair(newLhs.applyToTypeParams(unif), rhsType, PairOperator.SMALLERDOT)); return Optional.of(new MPair(newLhs.apply(unif), rhsType, PairOperator.SMALLERDOT));
} }
@Override @Override

4
src/de/dhbwstuttgart/typinference/unify/model/ExtendsType.java
View File

@ -52,7 +52,7 @@ public final class ExtendsType extends Type {
} }
@Override @Override
public Type applyToTypeParams(Unifier unif) { public Type apply(Unifier unif) {
return new ExtendsType(extendedType.applyToTypeParams(unif)); return new ExtendsType(extendedType.apply(unif));
} }
} }

5
src/de/dhbwstuttgart/typinference/unify/model/PlaceholderType.java
View File

@ -35,7 +35,10 @@ public final class PlaceholderType extends Type{
} }
@Override @Override
public Type applyToTypeParams(Unifier unif) { public Type apply(Unifier unif) {
if(this.equals(unif.getSource()))
return unif.getTarget();
return this; return this;
} }
} }

5
src/de/dhbwstuttgart/typinference/unify/model/SimpleType.java
View File

@ -43,7 +43,10 @@ public final class SimpleType extends Type {
} }
@Override @Override
public Type applyToTypeParams(Unifier unif) { public Type apply(Unifier unif) {
if(this.equals(unif.getSource()))
return unif.getTarget();
return new SimpleType(typeName, typeParams.apply(unif)); return new SimpleType(typeName, typeParams.apply(unif));
} }
} }

4
src/de/dhbwstuttgart/typinference/unify/model/SuperType.java
View File

@ -53,7 +53,7 @@ public final class SuperType extends Type {
} }
@Override @Override
public Type applyToTypeParams(Unifier unif) { public Type apply(Unifier unif) {
return new SuperType(superedType.applyToTypeParams(unif)); return new SuperType(superedType.apply(unif));
} }
} }

2
src/de/dhbwstuttgart/typinference/unify/model/Type.java
View File

@ -32,7 +32,7 @@ public abstract class Type {
public abstract Set<Type> grArg(IFiniteClosure fc); public abstract Set<Type> grArg(IFiniteClosure fc);
public abstract Type applyToTypeParams(Unifier unif); public abstract Type apply(Unifier unif);
@Override @Override
public String toString() { public String toString() {

2
src/de/dhbwstuttgart/typinference/unify/model/TypeParams.java
View File

@ -31,7 +31,7 @@ public final class TypeParams implements Iterable<Type>{
public TypeParams apply(Unifier unif) { public TypeParams apply(Unifier unif) {
Type[] newParams = new Type[typeParams.length]; Type[] newParams = new Type[typeParams.length];
for(int i = 0; i < typeParams.length; i++) for(int i = 0; i < typeParams.length; i++)
newParams[i] = typeParams[i].applyToTypeParams(unif); newParams[i] = typeParams[i].apply(unif);
return new TypeParams(newParams); return new TypeParams(newParams);
} }

21
test/unify/RuleSetTest.java
View File

@ -518,6 +518,27 @@ public class RuleSetTest {
@Test @Test
public void testAdapt() { public void testAdapt() {
TypeFactory tf = new TypeFactory();
FiniteClosureBuilder fcb = new FiniteClosureBuilder();
SimpleType t1 = tf.getSimpleType("Type1", "T", "U");
SimpleType t2 = tf.getSimpleType("Type2", "T");
SimpleType t3 = tf.getSimpleType("Type3", tf.getPlaceholderType("T"), tf.getSimpleType("Integer"));
fcb.add(t1, t2);
fcb.add(t2, t3);
IRuleSet rules = new RuleSet(fcb.getFiniteClosure());
SimpleType c1 = tf.getSimpleType("Type1", "String", "Double");
SimpleType c2 = tf.getSimpleType("Type2", "Object");
SimpleType c3 = tf.getSimpleType("Type3", "Object", "Number");
MPair pair1 = new MPair(c1, c2, PairOperator.SMALLERDOT);
MPair pair2 = new MPair(c1, c3, PairOperator.SMALLERDOT);
System.out.println("------ Adapt ------");
System.out.println(rules.adapt(pair1));
System.out.println(rules.adapt(pair2)); // Not working yet
} }