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

Removed code for rendering tuple types.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-11 22:08:14 +04:00
parent b09050bb18
commit fc14d98869
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
-24
View File
@@ -156,9 +156,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
else if (KotlinBuiltIns.getInstance().isUnit(type)) {
return escape(KotlinBuiltIns.UNIT_ALIAS + (type.isNullable() ? "?" : ""));
}
else if (KotlinBuiltIns.getInstance().isTupleType(type)) {
return escape(renderTupleType(type, shortNamesOnly));
}
else if (KotlinBuiltIns.getInstance().isFunctionType(type)) {
return escape(renderFunctionType(type, shortNamesOnly));
}
@@ -212,15 +209,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
}
private void appendTypes(StringBuilder result, List<JetType> types, boolean shortNamesOnly) {
for (Iterator<JetType> iterator = types.iterator(); iterator.hasNext(); ) {
result.append(renderType(iterator.next(), shortNamesOnly));
if (iterator.hasNext()) {
result.append(", ");
}
}
}
private void appendTypeProjections(StringBuilder result, List<TypeProjection> typeProjections, boolean shortNamesOnly) {
for (Iterator<TypeProjection> iterator = typeProjections.iterator(); iterator.hasNext(); ) {
TypeProjection typeProjection = iterator.next();
@@ -234,18 +222,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
}
protected String renderTupleType(JetType type, boolean shortNamesOnly) {
StringBuilder sb = new StringBuilder("#(");
appendTypes(sb, KotlinBuiltIns.getInstance().getTupleElementTypes(type), shortNamesOnly);
sb.append(")");
if (type.isNullable()) {
sb.append("?");
}
return sb.toString();
}
private String renderFunctionType(JetType type, boolean shortNamesOnly) {
StringBuilder sb = new StringBuilder();
compiler/testData/renderer/FunctionTypes.kt
+4 -4
View File
@@ -1,8 +1,8 @@
var v1 : () -> Tuple0
var v2 : (Int) -> Int
var v3 : (Int, #(String, String)) -> String
var v3 : (Int, String) -> String
var v4 : Function1<Int, String>
var v4 : (() -> Int, (#(String, String)) -> Tuple0) -> String
var v4 : (() -> Int, (String) -> Tuple0) -> String
var v5 : Int.() -> Int
var v6 : Int.(String, Int) -> Unit
var v7 : ExtensionFunction1<Int, String, Boolean>
@@ -10,9 +10,9 @@ var v7 : ExtensionFunction1<Int, String, Boolean>
//internal final var v1 : () -> Unit defined in root package
//internal final var v2 : (jet.Int) -> jet.Int defined in root package
//internal final var v3 : (jet.Int, #(jet.String, jet.String)) -> jet.String defined in root package
//internal final var v3 : (jet.Int, jet.String) -> jet.String defined in root package
//internal final var v4 : (jet.Int) -> jet.String defined in root package
//internal final var v4 : (() -> jet.Int, (#(jet.String, jet.String)) -> Unit) -> jet.String defined in root package
//internal final var v4 : (() -> jet.Int, (jet.String) -> Unit) -> jet.String defined in root package
//internal final var v5 : jet.Int.() -> jet.Int defined in root package
//internal final var v6 : jet.Int.(jet.String, jet.Int) -> Unit defined in root package
//internal final var v7 : jet.Int.(jet.String) -> jet.Boolean defined in root package