From bf42e3c093a463fb7c2241f9483efc9b361cfbba Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Dec 2012 14:49:04 +0400 Subject: [PATCH] Rendering "constructor" instead of "ctor". --- .../jet/renderer/DescriptorRendererImpl.java | 2 +- compiler/testData/renderer/Classes.kt | 12 ++++++------ compiler/testData/renderer/Enum.kt | 4 ++-- .../testData/renderer/InheritedMembersVisibility.kt | 2 +- compiler/testData/renderer/KeywordsInNames.kt | 6 +++--- .../diagnosticMessage/conflictingSubstitutions2.html | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index ddec3719656..0fd23dde06d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -435,7 +435,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { renderAnnotations(constructor, builder); renderVisibility(constructor.getVisibility(), builder); - builder.append(renderKeyword("ctor")).append(" "); + builder.append(renderKeyword("constructor")).append(" "); ClassDescriptor classDescriptor = constructor.getContainingDeclaration(); renderName(classDescriptor, builder); diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 0412b8f39b6..d53897c5b89 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -30,25 +30,25 @@ public trait TwoUpperBounds where T: Number, T: Any //package rendererTest defined in root package //internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest -//public ctor TheAnnotation() defined in rendererTest.TheAnnotation +//public constructor TheAnnotation() defined in rendererTest.TheAnnotation //rendererTest.TheAnnotation public open class TheClass defined in rendererTest -//public ctor TheClass() defined in rendererTest.TheClass +//public constructor TheClass() defined in rendererTest.TheClass // defined in rendererTest.TheClass // defined in rendererTest.TheClass //private final val privateVal : jet.Int defined in rendererTest.TheClass //internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass //protected abstract fun foo() : Unit defined in rendererTest.TheClass //private final class Inner defined in rendererTest.TheClass -//public ctor Inner() defined in rendererTest.TheClass.Inner +//public constructor Inner() defined in rendererTest.TheClass.Inner //internal final class InternalClass defined in rendererTest -//public ctor InternalClass() defined in rendererTest.InternalClass +//public constructor InternalClass() defined in rendererTest.InternalClass //internal trait TheTrait defined in rendererTest //internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait //class object : rendererTest.TheClass defined in rendererTest.TheTrait -//private ctor () defined in rendererTest.TheTrait. +//private constructor () defined in rendererTest.TheTrait. //internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait. //public final class WithReified defined in rendererTest -//public ctor WithReified() defined in rendererTest.WithReified +//public constructor WithReified() defined in rendererTest.WithReified // defined in rendererTest.WithReified // defined in rendererTest.WithReified //public trait TwoUpperBounds where T : jet.Number, T : jet.Any defined in rendererTest diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt index f9063009621..50d1a1be61a 100644 --- a/compiler/testData/renderer/Enum.kt +++ b/compiler/testData/renderer/Enum.kt @@ -6,8 +6,8 @@ private enum class TheEnum(val rgb : Int) { //package rendererTest defined in root package //private final enum class TheEnum : jet.Enum defined in rendererTest -//private ctor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum +//private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum //value-parameter val rgb : jet.Int defined in rendererTest.TheEnum. //private final enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum. -//private ctor VAL1() defined in rendererTest.TheEnum..VAL1 +//private constructor VAL1() defined in rendererTest.TheEnum..VAL1 //public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum. \ No newline at end of file diff --git a/compiler/testData/renderer/InheritedMembersVisibility.kt b/compiler/testData/renderer/InheritedMembersVisibility.kt index 0c6ad94fb41..e28371413f6 100644 --- a/compiler/testData/renderer/InheritedMembersVisibility.kt +++ b/compiler/testData/renderer/InheritedMembersVisibility.kt @@ -21,7 +21,7 @@ class B : A { //private abstract fun ( : jet.Int) : Unit defined in A //protected abstract fun f() : jet.Int defined in A //internal final class B : A defined in root package -//public ctor B() defined in B +//public constructor B() defined in B //public open var int : jet.Int defined in B //public open fun () : jet.Int defined in B //private open fun ( : jet.Int) : Unit defined in B diff --git a/compiler/testData/renderer/KeywordsInNames.kt b/compiler/testData/renderer/KeywordsInNames.kt index df202c950fb..e0b1bd40101 100644 --- a/compiler/testData/renderer/KeywordsInNames.kt +++ b/compiler/testData/renderer/KeywordsInNames.kt @@ -14,15 +14,15 @@ val `in` = `class`<`trait`>(null) fun `trait`.`fun`(`false`: `trait`): `trait` //internal final annotation class `true` : jet.Annotation defined in root package -//public ctor `true`() defined in `true` +//public constructor `true`() defined in `true` //internal final 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 ctor `class`<`in`>(p : `in`?) defined in `class` +//public constructor `class`<`in`>(p : `in`?) defined in `class` //<`in`> defined in `class` //value-parameter val p : `in`? defined in `class`. //internal final class `class` defined in `class` -//public ctor `class`() defined in `class`.`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 `trait`.`fun`(`false` : `trait`) : `trait` defined in root package diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions2.html b/idea/testData/diagnosticMessage/conflictingSubstitutions2.html index 9175462f81e..8e5947f6d40 100644 --- a/idea/testData/diagnosticMessage/conflictingSubstitutions2.html +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions2.html @@ -8,7 +8,7 @@ T -ctor +constructor Cons<T, E : java.lang.Cloneable>