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

Not rendering "final" for top-level functions and properties.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-27 20:51:17 +04:00
parent 60f8c8a343
commit 28c93f2912
8 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+8 -2
View File
@@ -326,6 +326,12 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
builder.append(renderKeyword(keyword)).append(" ");
}
private void renderModalityForCallable(@NotNull CallableMemberDescriptor callable, @NotNull StringBuilder builder) {
if (!(callable.getContainingDeclaration() instanceof NamespaceDescriptor) || callable.getModality() != Modality.FINAL) {
renderModality(callable.getModality(), builder);
}
}
private void renderOverrideAndMemberKind(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) {
if (verbose) {
if (!callableMember.getOverriddenDescriptors().isEmpty()) {
@@ -425,7 +431,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!startFromName) {
renderAnnotations(function, builder);
renderVisibility(function.getVisibility(), builder);
renderModality(function.getModality(), builder);
renderModalityForCallable(function, builder);
renderOverrideAndMemberKind(function, builder);
builder.append(renderKeyword("fun")).append(" ");
@@ -541,7 +547,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!startFromName) {
renderAnnotations(property, builder);
renderVisibility(property.getVisibility(), builder);
renderModality(property.getModality(), builder);
renderModalityForCallable(property, builder);
renderOverrideAndMemberKind(property, builder);
renderValVarPrefix(property, builder);
compiler/testData/renderer/ErrorType.kt
+1 -1
View File
@@ -1,3 +1,3 @@
val a : E = 0
//internal final val a : [ERROR : E] defined in root package
//internal val a : [ERROR : E] defined in root package
compiler/testData/renderer/FunctionTypes.kt
+8 -8
View File
@@ -8,11 +8,11 @@ var v6 : Int.(String, Int) -> Unit
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 defined in root package
//internal final var v4 : (jet.Int) -> 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
//internal var v1 : () -> Unit defined in root package
//internal var v2 : (jet.Int) -> jet.Int defined in root package
//internal var v3 : (jet.Int, jet.String) -> jet.String defined in root package
//internal var v4 : (jet.Int) -> jet.String defined in root package
//internal var v4 : (() -> jet.Int, (jet.String) -> Unit) -> jet.String defined in root package
//internal var v5 : jet.Int.() -> jet.Int defined in root package
//internal var v6 : jet.Int.(jet.String, jet.Int) -> Unit defined in root package
//internal var v7 : jet.Int.(jet.String) -> jet.Boolean defined in root package
compiler/testData/renderer/GlobalFunctions.kt
+8 -8
View File
@@ -20,19 +20,19 @@ fun <P> funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17
deprecated("") fun deprecatedFun()
//package rendererTest defined in root package
//public final fun pub() : Unit defined in rendererTest
//internal final fun int() : jet.String defined in rendererTest
//internal final fun int2(vararg ints : jet.Int) : jet.Int defined in rendererTest
//public fun pub() : Unit defined in rendererTest
//internal fun int() : jet.String defined in rendererTest
//internal fun int2(vararg ints : jet.Int) : jet.Int defined in rendererTest
//value-parameter vararg val ints : jet.Int defined in rendererTest.int2
//private final fun prv(a : jet.String, b : jet.Int = ...) : jet.Int defined in rendererTest
//private 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 b : jet.Int = ... defined in rendererTest.prv
//public final fun jet.Int.ext() : jet.Int defined in rendererTest
//public final fun <out T> withTypeParam(a : jet.Array<T>) : jet.Int defined in rendererTest
//public fun jet.Int.ext() : jet.Int defined in rendererTest
//public fun <out T> withTypeParam(a : jet.Array<T>) : jet.Int defined in rendererTest
//<out T> defined in rendererTest.withTypeParam
//value-parameter val a : jet.Array<T> defined in rendererTest.withTypeParam
//internal trait Foo defined in rendererTest
//internal trait Bar defined in rendererTest
//internal final fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Bar, P : rendererTest.Foo defined in rendererTest
//internal fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Bar, P : rendererTest.Foo defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//jet.deprecated internal final fun deprecatedFun() : Unit defined in rendererTest
//jet.deprecated internal fun deprecatedFun() : Unit defined in rendererTest
compiler/testData/renderer/GlobalProperties.kt
+9 -9
View File
@@ -17,13 +17,13 @@ public val <T> T.extWithTwoUpperBounds: Int where T: CharSequence, T: Number
get() {}
//package rendererTest defined in root package
//public final val pub : jet.String defined in rendererTest
//internal final var int : jet.String defined in rendererTest
//internal final val int2 : jet.Int defined in rendererTest
//private final var private : jet.Int defined in rendererTest
//public final val jet.Int.ext : jet.Int defined in rendererTest
//public final fun jet.Int.<get-ext>() : jet.Int defined in rendererTest
//jet.deprecated internal final val deprecatedVal : jet.Int defined in rendererTest
//public final val <T> T.extWithTwoUpperBounds : jet.Int where T : jet.CharSequence, T : jet.Number defined in rendererTest
//public val pub : jet.String defined in rendererTest
//internal var int : jet.String defined in rendererTest
//internal val int2 : jet.Int defined in rendererTest
//private var private : jet.Int defined in rendererTest
//public val jet.Int.ext : jet.Int defined in rendererTest
//public fun jet.Int.<get-ext>() : jet.Int defined in rendererTest
//jet.deprecated internal val deprecatedVal : jet.Int defined in rendererTest
//public val <T> T.extWithTwoUpperBounds : jet.Int where T : jet.CharSequence, T : jet.Number defined in rendererTest
//<T : jet.CharSequence & jet.Number> defined in rendererTest
//public final fun T.<get-extWithTwoUpperBounds>() : jet.Int defined in rendererTest
//public fun T.<get-extWithTwoUpperBounds>() : jet.Int defined in rendererTest
compiler/testData/renderer/KeywordsInNames.kt
+4 -4
View File
@@ -15,7 +15,7 @@ fun <`in`: `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in`: Number
//internal final annotation class `true` : jet.Annotation defined in root package
//public constructor `true`() defined in `true`
//internal final val `val` : jet.Int defined in root package
//internal val `val` : jet.Int defined in root package
//`true` internal trait `trait` defined in root package
//internal final class `class`<`in`> defined in root package
//public constructor `class`<`in`>(p : `in`?) defined in `class`
@@ -23,8 +23,8 @@ fun <`in`: `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in`: Number
//value-parameter val p : `in`? defined in `class`.<init>
//internal final class `class` defined in `class`
//public constructor `class`() defined in `class`.`class`
//internal final val `is` : `class`.`class` defined in root package
//internal final val `in` : `class`<`trait`> defined in root package
//internal final fun <`in`> `trait`.`fun`(`false` : `trait`) : `trait` where `in` : `trait`, `in` : jet.Number defined in root package
//internal val `is` : `class`.`class` defined in root package
//internal val `in` : `class`<`trait`> defined in root package
//internal fun <`in`> `trait`.`fun`(`false` : `trait`) : `trait` where `in` : `trait`, `in` : jet.Number defined in root package
//<`in` : `trait` & jet.Number> defined in `fun`
//value-parameter val `false` : `trait` defined in `fun`
compiler/testData/renderer/TupleTypes.kt
+4 -4
View File
@@ -3,7 +3,7 @@ var v2 : Tuple0?
var v3 : Unit
var v4 : Unit?
//internal final var v1 : Unit defined in root package
//internal final var v2 : Unit? defined in root package
//internal final var v3 : Unit defined in root package
//internal final var v4 : Unit? defined in root package
//internal var v1 : Unit defined in root package
//internal var v2 : Unit? defined in root package
//internal var v3 : Unit defined in root package
//internal var v4 : Unit? defined in root package
idea/testData/libraries/decompiled/namespace.kt
+11 -11
View File
@@ -3,24 +3,24 @@
package testData.libraries
[public final val globalVal : testData.libraries.Pair<jet.Int, jet.String>] /* compiled code */
[public val globalVal : testData.libraries.Pair<jet.Int, jet.String>] /* compiled code */
[public final val globalValWithGetter : jet.Long] /* compiled code */
[public val globalValWithGetter : jet.Long] /* compiled code */
[public final val jet.Int.exProp : jet.Int] /* compiled code */
[public val jet.Int.exProp : jet.Int] /* compiled code */
[public final val jet.String.exProp : jet.String] /* compiled code */
[public val jet.String.exProp : jet.String] /* compiled code */
[public final val <T> testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
[public val <T> testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
[public final fun func() : Unit { /* compiled code */ }]
[public fun func() : Unit { /* compiled code */ }]
[public final fun func(a : jet.Int, b : jet.Int) : Unit { /* compiled code */ }]
[public fun func(a : jet.Int, b : jet.Int) : Unit { /* compiled code */ }]
[public final fun func(a : jet.Int, b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
[public fun func(a : jet.Int, b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
[public final fun func(str : jet.String) : Unit { /* compiled code */ }]
[public fun func(str : jet.String) : Unit { /* compiled code */ }]
[public final fun main(args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[public fun main(args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[public final fun <T> T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]
[public fun <T> T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]