azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix JetOverloadTest broken in e97b91c6e4

Browse Source
This commit is contained in:
Stepan Koltsov
2011-11-12 21:38:27 +04:00
parent e97b91c6e4
commit 537a9ba804
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java
+3
View File
@@ -7,6 +7,9 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
*/ */
public class OverloadUtil { public class OverloadUtil {
/**
* Does not check names.
*/
public static OverloadCompatibilityInfo isOverloadble(FunctionDescriptor a, FunctionDescriptor b) { public static OverloadCompatibilityInfo isOverloadble(FunctionDescriptor a, FunctionDescriptor b) {
OverridingUtil.OverrideCompatibilityInfo overrideCompatibilityInfo = OverridingUtil.isOverridableByImpl(a, b, false); OverridingUtil.OverrideCompatibilityInfo overrideCompatibilityInfo = OverridingUtil.isOverridableByImpl(a, b, false);
if (overrideCompatibilityInfo.isSuccess()) { if (overrideCompatibilityInfo.isSuccess()) {
compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
-4
View File
@@ -64,10 +64,6 @@ public class JetOverloadTest extends JetLiteFixture {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
assertOverloadable(
"fun ab() : Int",
"fun a() : Int");
assertNotOverloadable( assertNotOverloadable(
"fun a() : Int", "fun a() : Int",
"fun a() : Any"); "fun a() : Any");