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

Rename getOutType() -> getType()

Browse Source
This commit is contained in:
Andrey Breslav
2012-02-24 18:50:40 +04:00
parent 1f4f4e5c24
commit d22f4eb144
42 changed files with 100 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
+2 -4
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.compiler;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.PropertyCodegen;
@@ -34,7 +33,6 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JavaNamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -282,7 +280,7 @@ class NamespaceComparator {
}
sb.append(prop.getName());
sb.append(": ");
new Serializer(sb).serialize(prop.getOutType());
new Serializer(sb).serialize(prop.getType());
}
public void serialize(ValueParameterDescriptor valueParameter) {
@@ -297,7 +295,7 @@ class NamespaceComparator {
if (valueParameter.getVarargElementType() != null) {
serialize(valueParameter.getVarargElementType());
} else {
serialize(valueParameter.getOutType());
serialize(valueParameter.getType());
}
if (valueParameter.hasDefaultValue()) {
sb.append(" = ?");
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
List<ValueParameterDescriptor> unsubstitutedValueParameters = resolvedCall.getResultingDescriptor().getValueParameters();
for (int i = 0, unsubstitutedValueParametersSize = unsubstitutedValueParameters.size(); i < unsubstitutedValueParametersSize; i++) {
ValueParameterDescriptor unsubstitutedValueParameter = unsubstitutedValueParameters.get(i);
if (unsubstitutedValueParameter.getOutType().equals(parameterType[i])) {
if (unsubstitutedValueParameter.getType().equals(parameterType[i])) {
return resolvedCall.getResultingDescriptor();
}
}