forked from JavaTX/JavaCompilerCore
Wildcards im Subst im Unify eingefuegt
This commit is contained in:
parent
9861fb2f3b
commit
4046066b7c
@ -3,7 +3,7 @@
|
|||||||
<classpathentry kind="src" path="src"/>
|
<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 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="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="lib" path="lib/junit-4.0.jar"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
2
bin/.gitignore
vendored
2
bin/.gitignore
vendored
@ -1,6 +1,6 @@
|
|||||||
/bytecode/
|
|
||||||
/de/
|
/de/
|
||||||
/mycompiler/
|
/mycompiler/
|
||||||
/parser/
|
/parser/
|
||||||
/plugindevelopment/
|
/plugindevelopment/
|
||||||
/syntaxTree/
|
/syntaxTree/
|
||||||
|
/bytecode/
|
||||||
|
@ -2400,6 +2400,36 @@ throws MatchException
|
|||||||
return true;
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
// ino.end
|
// ino.end
|
||||||
|
Loading…
Reference in New Issue
Block a user