diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java index 84bc7522..b023790b 100644 --- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java +++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java @@ -151,20 +151,22 @@ public class TypeUnify { for(Set eqPrime : eqPrimeSetFlat) { Optional> eqPrimePrime = rules.subst(eqPrime); - /*if (eqPrime.equals(eq)) + if (eqPrime.equals(eq)) eqPrimePrimeSet.add(eqPrime); else if(eqPrimePrime.isPresent()) { - Set> subUnifyResult = unify(eqPrimePrime.get(), fc); - eqPrimePrimeSet.addAll(subUnifyResult); + restartSet.add(eqPrimePrime.get()); + /*Set> subUnifyResult = unify(eqPrimePrime.get(), fc); + eqPrimePrimeSet.addAll(subUnifyResult);*/ } else - eqPrimePrimeSet.addAll(this.unify(eqPrime, fc));*/ - if(eqPrimePrime.isPresent()) + restartSet.add(eqPrime); + //eqPrimePrimeSet.addAll(this.unify(eqPrime, fc)); + /*if(eqPrimePrime.isPresent()) restartSet.add(eqPrimePrime.get()); else if(!isSolvedForm(eqPrime)) restartSet.add(eqPrime); else - eqPrimePrimeSet.add(eqPrime); + eqPrimePrimeSet.add(eqPrime);*/ } /*