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

Extracted DescriptorRenderer interface.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-13 21:48:18 +04:00
parent b73ba148b6
commit 1cfc5f366e
45 changed files with 188 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collection;
import java.util.List;
@@ -94,7 +94,7 @@ public class JavaToKotlinMethodMap {
@NotNull
public static String serializeFunction(@NotNull FunctionDescriptor fun) {
return DescriptorRendererImpl.TEXT.render(fun);
return DescriptorRenderer.TEXT.render(fun);
}
// used in generated code
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.List;
import java.util.Map;
@@ -97,7 +97,7 @@ public abstract class ElementAlternativeSignatureData {
else {
throw new AlternativeSignatureMismatchException(
"Return type in alternative signature is missing, while in real signature it is '%s'",
DescriptorRendererImpl.TEXT.renderType(originalType));
DescriptorRenderer.TEXT.renderType(originalType));
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+3 -3
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
@@ -67,7 +67,7 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
public JetType visitNullableType(JetNullableType nullableType, Void aVoid) {
if (!originalType.isNullable() && typeUsage != TYPE_ARGUMENT) {
throw new AlternativeSignatureMismatchException("Auto type '%s' is not-null, while type in alternative signature is nullable: '%s'",
DescriptorRendererImpl.TEXT.renderType(originalType), nullableType.getText());
DescriptorRenderer.TEXT.renderType(originalType), nullableType.getText());
}
return TypeUtils.makeNullable(computeType(nullableType.getInnerType(), originalType, originalToAltTypeParameters, typeUsage));
}
@@ -117,7 +117,7 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
if (arguments.size() != type.getTypeArgumentsAsTypes().size()) {
throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them",
DescriptorRendererImpl.TEXT.renderType(originalType), arguments.size(), type.getText(),
DescriptorRenderer.TEXT.renderType(originalType), arguments.size(), type.getText(),
type.getTypeArgumentsAsTypes().size());
}