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

neue abbruchbedingung

Browse Source
This commit is contained in:
Florian Steurer 2016-04-14 15:15:21 +02:00
parent fbcd0cd8a5
commit afc6bc7b89
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
View File

@ -151,20 +151,22 @@ public class TypeUnify {
for(Set<UnifyPair> eqPrime : eqPrimeSetFlat) { for(Set<UnifyPair> eqPrime : eqPrimeSetFlat) {
Optional<Set<UnifyPair>> eqPrimePrime = rules.subst(eqPrime); Optional<Set<UnifyPair>> eqPrimePrime = rules.subst(eqPrime);
/*if (eqPrime.equals(eq)) if (eqPrime.equals(eq))
eqPrimePrimeSet.add(eqPrime); eqPrimePrimeSet.add(eqPrime);
else if(eqPrimePrime.isPresent()) { else if(eqPrimePrime.isPresent()) {
Set<Set<UnifyPair>> subUnifyResult = unify(eqPrimePrime.get(), fc); restartSet.add(eqPrimePrime.get());
eqPrimePrimeSet.addAll(subUnifyResult); /*Set<Set<UnifyPair>> subUnifyResult = unify(eqPrimePrime.get(), fc);
eqPrimePrimeSet.addAll(subUnifyResult);*/
} }
else else
eqPrimePrimeSet.addAll(this.unify(eqPrime, fc));*/ restartSet.add(eqPrime);
if(eqPrimePrime.isPresent()) //eqPrimePrimeSet.addAll(this.unify(eqPrime, fc));
/*if(eqPrimePrime.isPresent())
restartSet.add(eqPrimePrime.get()); restartSet.add(eqPrimePrime.get());
else if(!isSolvedForm(eqPrime)) else if(!isSolvedForm(eqPrime))
restartSet.add(eqPrime); restartSet.add(eqPrime);
else else
eqPrimePrimeSet.add(eqPrime); eqPrimePrimeSet.add(eqPrime);*/
} }
/* /*