From 9a844d2feb8c0a838a6b5964abf9884e83117777 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 10 Mar 2015 16:20:31 +0300 Subject: [PATCH] Minor: replace some missed mentions of 'class object' with 'default object' --- .../kotlin/descriptors/impl/MutableClassDescriptor.java | 2 +- js/js.translator/testData/inlineStdlib/cases/callNameClash.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 8d871f31790..c555e64c40c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -98,7 +98,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class return defaultObjectDescriptor; } - public void setClassObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + public void setDefaultObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { assert this.defaultObjectDescriptor == null : "classObjectDescriptor already assigned in " + this; this.defaultObjectDescriptor = classObjectDescriptor; } diff --git a/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt b/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt index 15f2a01562d..b9ad5c4dcb8 100644 --- a/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt +++ b/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt @@ -7,7 +7,7 @@ fun f(x: Int): Int = x * 2 fun Int.f(): Int = this * 3 class A(var value: Int) { - class object { + default object { fun f(): Int = 5 }