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

.

Browse Source
This commit is contained in:
Florian Steurer 2016-04-02 11:29:31 +02:00
parent d89d06797e
commit 0be7534b98
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/de/dhbwstuttgart/syntaxtree/factory/Unify_FC_TTO_Builder.java
View File

@ -14,11 +14,13 @@ public class Unify_FC_TTO_Builder {
public void AddInheritance(Type t1, Type t2) { public void AddInheritance(Type t1, Type t2) {
if(t1 instanceof RefType) if(t1 instanceof RefType)
classes.add(new Class(t1.get_Name(), t1.getOffset())); if(!classes.stream().anyMatch(x -> x.getName().equals(t1.getName())))
classes.add(new Class(t1.get_Name(), t1.getOffset()));
if(t2 instanceof RefType) if(t2 instanceof RefType)
classes.add(new Class(t2.get_Name(), t2.getOffset())); if(!classes.stream().anyMatch(x -> x.getName().equals(t2.getName())))
classes.add(new Class(t2.get_Name(), t2.getOffset()));
fc.add(new Pair(t1, t2)); fc.add(new Pair(t1, t2));
} }

3
test/unify/UnifyTest.java
View File

@ -50,8 +50,9 @@ public class UnifyTest extends Unify {
Set<MPair> eq = new HashSet<MPair>(); Set<MPair> eq = new HashSet<MPair>();
Set<Set<MPair>> expected = new HashSet<>(); Set<Set<MPair>> expected = new HashSet<>();
expected.add(new HashSet<>());
Set<Set<MPair>> actual = unify(eq, fc); Set<Set<MPair>> actual = unify(eq, fc);
Assert.assertEquals(actual, expected); Assert.assertEquals(expected, actual);
/* /*
* Test 2: * Test 2: