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

Rendering variance when type parameter is reified.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-25 01:34:35 +04:00
parent fbaaee65e1
commit b300329e21
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+5 -7
View File
@@ -313,15 +313,13 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
builder.append(lt());
}
if (!descriptor.isReified()) {
String variance = descriptor.getVariance().toString();
if (!variance.isEmpty()) {
builder.append(renderKeyword(variance)).append(" ");
}
}
else {
if (descriptor.isReified()) {
builder.append(renderKeyword("reified")).append(" ");
}
String variance = descriptor.getVariance().toString();
if (!variance.isEmpty()) {
builder.append(renderKeyword(variance)).append(" ");
}
renderName(descriptor, builder);
if (descriptor.getUpperBounds().size() == 1) {
JetType upperBound = descriptor.getUpperBounds().iterator().next();
compiler/testData/renderer/Classes.kt
+7 -1
View File
@@ -24,6 +24,8 @@ trait TheTrait {
}
}
public class WithReified<reified A, reified out B>
//package rendererTest defined in root package
//internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest
//public ctor TheAnnotation() defined in rendererTest.TheAnnotation
@@ -42,4 +44,8 @@ trait TheTrait {
//internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait
//class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
//private ctor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//public final class WithReified<reified A, reified out B> defined in rendererTest
//public ctor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
//<reified A> defined in rendererTest.WithReified
//<reified out B> defined in rendererTest.WithReified