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

Im Unify generierte TPH beachten

Browse Source
This commit is contained in:
JanUlrich 2016-04-19 15:27:46 +02:00
parent a8f18e77be
commit fcbd05fa9c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
View File

@ -191,7 +191,11 @@ public class UnifyTypeFactory {
} }
public static Type convert(PlaceholderType t) { public static Type convert(PlaceholderType t) {
return TypePlaceholder.getInstance(t.getName()); TypePlaceholder ret = TypePlaceholder.getInstance(t.getName());
if(ret == null){ //Dieser TPH wurde vom Unifikationsalgorithmus erstellt
ret = TypePlaceholder.fresh(t.getName(), NULL_NODE);
}
return ret;
} }
public static Type convert(UnifyType t) { public static Type convert(UnifyType t) {
@ -206,7 +210,8 @@ public class UnifyTypeFactory {
private static List<Type> convert(TypeParams typeParams) { private static List<Type> convert(TypeParams typeParams) {
List<Type> ret = new ArrayList<>(); List<Type> ret = new ArrayList<>();
for(UnifyType uT : typeParams){ for(UnifyType uT : typeParams){
ret.add(convert(uT)); Type toAdd = convert(uT);
ret.add(toAdd);
} }
return ret; return ret;
} }

2
src/de/dhbwstuttgart/syntaxtree/type/RefType.java
View File

@ -256,8 +256,6 @@ public class RefType extends ObjectType implements IMatchable
else paralist.add(t); else paralist.add(t);
}*/ }*/
this.parameter = v;//paralist; this.parameter = v;//paralist;
//parserlog.debug("T->Type.java->set_ParaList->parameter: " + parameter);
//parserlog.debug("T->Type.java->get_Type: " + getName());
} }
// ino.end // ino.end