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

Escaping parameter names in "where".

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-26 22:29:36 +04:00
parent 862a6ffbbc
commit da7f4f3421
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+1 -1
View File
@@ -455,7 +455,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
for (TypeParameterDescriptor typeParameter : typeParameters) {
if (typeParameter.getUpperBounds().size() > 1) {
for (JetType upperBound : typeParameter.getUpperBounds()) {
upperBoundStrings.add(typeParameter.getName() + " : " + escape(renderType(upperBound)));
upperBoundStrings.add(renderName(typeParameter.getName()) + " : " + escape(renderType(upperBound)));
}
}
}
compiler/testData/renderer/KeywordsInNames.kt
+3 -2
View File
@@ -11,7 +11,7 @@ class `class`<`in`>(p: `in`?) {
val `is` = `class`.`class`()
val `in` = `class`<`trait`>(null)
fun `trait`.`fun`(`false`: `trait`): `trait`
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`
@@ -25,5 +25,6 @@ fun `trait`.`fun`(`false`: `trait`): `trait`
//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 `trait`.`fun`(`false` : `trait`) : `trait` defined in root package
//internal final 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`