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

Remove superfluous isVararg() from JavaMethod

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-29 15:39:39 +04:00
parent 924283d2d9
commit 3485d65d8a
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+6 -3
View File
@@ -376,15 +376,18 @@ public class SingleAbstractMethodUtils {
@NotNull JavaTypeSubstitutor substitutor2
) {
if (!method1.getName().equals(method2.getName())) return false;
if (method1.isVararg() != method2.isVararg()) return false;
Collection<JavaValueParameter> parameters1 = method1.getValueParameters();
Collection<JavaValueParameter> parameters2 = method2.getValueParameters();
if (parameters1.size() != parameters2.size()) return false;
for (Iterator<JavaValueParameter> it1 = parameters1.iterator(), it2 = parameters2.iterator(); it1.hasNext(); ) {
JavaType type1 = DescriptorResolverUtils.erasure(substitutor1.substitute(it1.next().getType()), substitutor1);
JavaType type2 = DescriptorResolverUtils.erasure(substitutor2.substitute(it2.next().getType()), substitutor2);
JavaValueParameter param1 = it1.next();
JavaValueParameter param2 = it2.next();
if (param1.isVararg() != param2.isVararg()) return false;
JavaType type1 = DescriptorResolverUtils.erasure(substitutor1.substitute(param1.getType()), substitutor1);
JavaType type2 = DescriptorResolverUtils.erasure(substitutor2.substitute(param2.getType()), substitutor2);
if (!(type1 == null ? type2 == null : type1.equals(type2))) return false;
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java
-2
View File
@@ -29,6 +29,4 @@ public interface JavaMethod extends JavaMember, JavaTypeParameterListOwner {
@Nullable
JavaType getReturnType();
boolean isVararg();
}