diff --git a/src/main/scala/hb/dhbw/InsertTypes.scala b/src/main/scala/hb/dhbw/InsertTypes.scala index 94ec681..c4d9622 100644 --- a/src/main/scala/hb/dhbw/InsertTypes.scala +++ b/src/main/scala/hb/dhbw/InsertTypes.scala @@ -11,7 +11,7 @@ object InsertTypes { case v => v } def sigma(x: UnifyType): Type = { x match { - case UnifyTV(n) => { + case UnifyTV(n) => val to = solvedCons.find(_.left == x).get to match { case UnifyEqualsDot(UnifyTV(_), UnifyTV(x)) => GenericType(x) @@ -19,7 +19,6 @@ object InsertTypes { case UnifyEqualsDot(UnifyTV(_), UnifyRefType(n, ps)) => RefType(n, ps.map(this.sigma(_))) case UnifyLessDot(UnifyTV(x), UnifyRefType(n, ps)) => GenericType(x) } - } case UnifyRefType(n, List()) => if(genericNames.contains(n)) GenericType(n) else RefType(n, List()) case UnifyRefType(n, ps) => RefType(n, ps.map(sigma)) } diff --git a/src/test/scala/IntegrationTest.scala b/src/test/scala/IntegrationTest.scala index 37dee87..5d865dc 100644 --- a/src/test/scala/IntegrationTest.scala +++ b/src/test/scala/IntegrationTest.scala @@ -96,4 +96,11 @@ class IntegrationTest extends FunSuite { assert(result.isRight) println(result.map(it => Main.prettyPrintAST(it))) } + + test("pairAdd.twoTimes") { + val input = "class Pair extends Object{\n A fst;\n \n setfst(p) {\n return p;\n }\n }\n\n class Example extends Object{\n\n m(p){\n return p.setfst(p.setfst(this));\n }\n }" + val result = FJTypeinference.typeinference(input) + assert(result.isRight) + println(result.map(it => Main.prettyPrintAST(it))) + } } diff --git a/src/test/scala/UnifyTest.scala b/src/test/scala/UnifyTest.scala index 95624c8..b76418d 100644 --- a/src/test/scala/UnifyTest.scala +++ b/src/test/scala/UnifyTest.scala @@ -34,8 +34,6 @@ class UnifyTest extends FunSuite { UnifyLessDot(UnifyTV("F"), UnifyRefType("Object", List()))) val result = Unify.unifyIterative(Set(Set(input)), new FiniteClosure(Set((FJNamedType("Pair", List(FJNamedType("X", List()),FJNamedType("X", List()))), FJNamedType("Object", List()))))) println(result) - //assert(result.contains(UnifyEqualsDot(UnifyTV("a"), UnifyTV("b")))) - //assert(result.contains(UnifyEqualsDot(UnifyTV("b"), UnifyTV("a")))) } /* test("Unify.step2") {