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

Removed val/var soft keywords in renderer for functions

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-19 18:58:40 +04:00
parent 85ce85383b
commit 1f7c435a24
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+10 -4
View File
@@ -81,7 +81,7 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
@Override @Override
public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) { public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
super.visitVariableDescriptor(descriptor, builder); super.visitVariableDescriptor(descriptor, builder, true);
if (descriptor.hasDefaultValue()) { if (descriptor.hasDefaultValue()) {
builder.append(" = ..."); builder.append(" = ...");
} }
@@ -260,9 +260,13 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
@Override @Override
public Void visitVariableDescriptor(VariableDescriptor descriptor, StringBuilder builder) { public Void visitVariableDescriptor(VariableDescriptor descriptor, StringBuilder builder) {
return visitVariableDescriptor(descriptor, builder, false);
}
protected Void visitVariableDescriptor(VariableDescriptor descriptor, StringBuilder builder, boolean skipValVar) {
String typeString = renderPropertyPrefixAndComputeTypeString( String typeString = renderPropertyPrefixAndComputeTypeString(
builder, builder,
descriptor.isVar(), skipValVar ? null : descriptor.isVar(),
Collections.<TypeParameterDescriptor>emptyList(), Collections.<TypeParameterDescriptor>emptyList(),
ReceiverDescriptor.NO_RECEIVER, ReceiverDescriptor.NO_RECEIVER,
descriptor.getType()); descriptor.getType());
@@ -273,13 +277,15 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
private String renderPropertyPrefixAndComputeTypeString( private String renderPropertyPrefixAndComputeTypeString(
@NotNull StringBuilder builder, @NotNull StringBuilder builder,
boolean isVar, @Nullable Boolean isVar,
@NotNull List<TypeParameterDescriptor> typeParameters, @NotNull List<TypeParameterDescriptor> typeParameters,
@NotNull ReceiverDescriptor receiver, @NotNull ReceiverDescriptor receiver,
@Nullable JetType outType) { @Nullable JetType outType) {
String typeString = lt() + "no type>"; String typeString = lt() + "no type>";
if (outType != null) { if (outType != null) {
builder.append(renderKeyword(isVar ? "var" : "val")).append(" "); if (isVar != null) {
builder.append(renderKeyword(isVar ? "var" : "val")).append(" ");
}
typeString = renderType(outType); typeString = renderType(outType);
} }
compiler/testData/renderer/GlobalFunctions.kt
+2 -2
View File
@@ -13,9 +13,9 @@ public fun Int.ext() : Int {}
//package rendererTest defined in root package //package rendererTest defined in root package
//public final fun pub() : Unit defined in rendererTest //public final fun pub() : Unit defined in rendererTest
//internal final fun int() : jet.String defined in rendererTest //internal final fun int() : jet.String defined in rendererTest
//internal final fun int2(val ints : jet.IntArray) : jet.Int defined in rendererTest //internal final fun int2(ints : jet.IntArray) : jet.Int defined in rendererTest
//value-parameter vararg val ints : jet.IntArray defined in rendererTest.int2 //value-parameter vararg val ints : jet.IntArray defined in rendererTest.int2
//private final fun prv(val a : jet.String, val b : jet.Int = ...) : jet.Int defined in rendererTest //private final fun prv(a : jet.String, b : jet.Int = ...) : jet.Int defined in rendererTest
//value-parameter val a : jet.String defined in rendererTest.prv //value-parameter val a : jet.String defined in rendererTest.prv
//value-parameter val b : jet.Int defined in rendererTest.prv //value-parameter val b : jet.Int defined in rendererTest.prv
//public final fun jet.Int.ext() : jet.Int defined in rendererTest //public final fun jet.Int.ext() : jet.Int defined in rendererTest
idea/testData/libraries/decompiled/namespace.kt
+5 -5
View File
@@ -15,12 +15,12 @@ package testData.libraries
[public final fun func() : Unit { /* compiled code */ }] [public final fun func() : Unit { /* compiled code */ }]
[public final fun func(val a : jet.Int, val b : jet.Int) : Unit { /* compiled code */ }] [public final fun func(a : jet.Int, b : jet.Int) : Unit { /* compiled code */ }]
[public final fun func(val a : jet.Int, val b : jet.String = /* compiled code */) : Unit { /* compiled code */ }] [public final fun func(a : jet.Int, b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
[public final fun func(val str : jet.String) : Unit { /* compiled code */ }] [public final fun func(str : jet.String) : Unit { /* compiled code */ }]
[public final fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }] [public final fun main(args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[public final fun <T : jet.Any?>T.filter(val predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }] [public final fun <T : jet.Any?> T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]