i21012/JavaPatternMatching
1
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Fehler beim Umwandeln von Generischen Variablen zu TPH beseitigt

Browse Source
This commit is contained in:
JanUlrich 2014-07-16 16:40:49 +02:00
parent f059e0b9b8
commit df67185b45
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mycompiler/mytype/GenericTypeVar.java
View File

@ -182,7 +182,7 @@ public class GenericTypeVar extends Type
public TypePlaceholder getTypePlaceHolder() { public TypePlaceholder getTypePlaceHolder() {
if(!GenericTypeVar.tph.containsKey(this)){ if(!GenericTypeVar.tph.containsKey(this)){
GenericTypeVar.tph.put(this, TypePlaceholder.fresh()); GenericTypeVar.tph.put(this, TypePlaceholder.fresh(this.getName()));
} }
return GenericTypeVar.tph.get(this); return GenericTypeVar.tph.get(this);
//if(this.tph == null)this.tph = TypePlaceholder.fresh(); //if(this.tph == null)this.tph = TypePlaceholder.fresh();

23
src/mycompiler/mytype/TypePlaceholder.java
View File

@ -89,7 +89,7 @@ public class TypePlaceholder extends Type implements IReplaceTypeEventProvider
* Variablen. <br>Author: J<EFBFBD>rg B<EFBFBD>uerle * Variablen. <br>Author: J<EFBFBD>rg B<EFBFBD>uerle
* @return Die <code>TypePlaceholder</code> * @return Die <code>TypePlaceholder</code>
*/ */
// ino.end // ino.end
// ino.method.fresh.26800.definition // ino.method.fresh.26800.definition
public static TypePlaceholder fresh() public static TypePlaceholder fresh()
// ino.end // ino.end
@ -101,6 +101,27 @@ public class TypePlaceholder extends Type implements IReplaceTypeEventProvider
} }
// ino.end // ino.end
/**
* Generiert einen neuen TPH mit einem bestimmten Namen.
* Wird benötigt, wenn aus Generischen Variablen TPH generiert werden.
* @param name
* @return
*/
public static TypePlaceholder fresh(String name)
// ino.end
// ino.method.fresh.26800.body
{
TypePlaceholder typeVar = new TypePlaceholder(name);
TypePlaceholder oldTPH = m_TypePlaceholdersRegistry.put(typeVar.getName(), typeVar);
if(oldTPH != null){
oldTPH.name = makeNewName();
m_TypePlaceholdersRegistry.put(oldTPH.getName(), oldTPH);
}
return typeVar;
}
// ino.end
/** /**
* @author Andreas Stadelmeier, a10023 * @author Andreas Stadelmeier, a10023
* Ruft die TypePlaceholder.fresh()-Methode auf. * Ruft die TypePlaceholder.fresh()-Methode auf.