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

Got rid of conustructors zoo in value parameter and getter/setter descriptors.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-03-25 19:46:39 +04:00
parent cf61446d69
commit b736d1602e
20 changed files with 55 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+1
View File
@@ -148,6 +148,7 @@ public class LazyJavaClassMemberScope(
result.add(ValueParameterDescriptorImpl(
constructor,
null,
index,
Annotations.EMPTY,
method.getName(),
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+1
View File
@@ -210,6 +210,7 @@ public abstract class LazyJavaMemberScope(
ValueParameterDescriptorImpl(
function,
null,
index,
c.resolveAnnotations(javaParameter),
name,
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+2 -2
View File
@@ -147,7 +147,7 @@ public class SingleAbstractMethodUtils {
assert parameterType != null : "couldn't substitute type: " + parameterTypeUnsubstituted +
", substitutor = " + typeParameters.substitutor;
ValueParameterDescriptor parameter = new ValueParameterDescriptorImpl(
result, 0, Annotations.EMPTY, Name.identifier("function"), parameterType, false, null);
result, null, 0, Annotations.EMPTY, Name.identifier("function"), parameterType, false, null);
JetType returnType = typeParameters.substitutor.substitute(samInterface.getDefaultType(), Variance.OUT_VARIANCE);
assert returnType != null : "couldn't substitute type: " + samInterface.getDefaultType() +
@@ -251,7 +251,7 @@ public class SingleAbstractMethodUtils {
assert newType != null : "couldn't substitute type: " + newTypeUnsubstituted + ", substitutor = " + typeParameters.substitutor;
ValueParameterDescriptor newParam = new ValueParameterDescriptorImpl(
adapter, originalParam.getIndex(), originalParam.getAnnotations(), originalParam.getName(), newType, false, null);
adapter, null, originalParam.getIndex(), originalParam.getAnnotations(), originalParam.getName(), newType, false, null);
valueParameters.add(newParam);
}