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

Wildcards im Subst im Unify eingefuegt

Browse Source
This commit is contained in:
Martin Plümicke 2014-12-05 17:25:46 +01:00
parent 9861fb2f3b
commit 4046066b7c
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".classpath|.cvsignore|.externalToolBuilders/|.project|.settings/|Papers/|bin/|doc/|examples/|lib/|notizen/|src/|test/|tools/" including="log4j.xml" kind="src" path=""/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0]"/>
<classpathentry kind="lib" path="lib/junit-4.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
bin/.gitignore vendored
View File

@ -1,6 +1,6 @@
/bytecode/
/de/
/mycompiler/
/parser/
/plugindevelopment/
/syntaxTree/
/bytecode/

30
src/de/dhbwstuttgart/typeinference/unify/Unify.java
View File

@ -2400,6 +2400,36 @@ throws MatchException
return true;
}
}
//Wildcard ergänzt PL 12-12-05
if ( T instanceof ExtendsWildcardType )
{
Type Temp = ((ExtendsWildcardType) T).get_ExtendsType();
if( Temp instanceof TypePlaceholder )
{
if( Temp.getName().equals(a.getName()) )
{
// Typvariable ersetzen
((ExtendsWildcardType) T).SetWildcardType(o);
return true;
}
}
}
if ( T instanceof SuperWildcardType )
{
Type Temp = ((SuperWildcardType) T).get_SuperType();
if( Temp instanceof TypePlaceholder )
{
if( Temp.getName().equals(a.getName()) )
{
// Typvariable ersetzen
((SuperWildcardType) T).SetWildcardType(o);
return true;
}
}
}
return false;
}
// ino.end