diff --git a/js/js.libraries/src/js/callableReferenceUtils.js b/js/js.libraries/src/js/callableReferenceUtils.js index 7d9bf8716f5..ffe7cae3af0 100644 --- a/js/js.libraries/src/js/callableReferenceUtils.js +++ b/js/js.libraries/src/js/callableReferenceUtils.js @@ -54,7 +54,7 @@ var propertyRefClassMetadataCache = [ function getPropertyRefMetadata(cache) { if (cache.value === null) { cache.value = { - baseClasses: [cache.implementedInterface()], + interfaces: [cache.implementedInterface()], baseClass: null, functions: {}, properties: {}, diff --git a/js/js.libraries/src/js/rtti.js b/js/js.libraries/src/js/rtti.js index bcc271191ee..51b3c9cdd34 100644 --- a/js/js.libraries/src/js/rtti.js +++ b/js/js.libraries/src/js/rtti.js @@ -55,15 +55,15 @@ Kotlin.callSetter = function (thisObject, klass, propertyName, value) { function isInheritanceFromInterface(metadata, iface) { if (metadata == null) return false; - var baseClasses = metadata.baseClasses; + var interfaces = metadata.interfaces; var i; - for (i = 0; i < baseClasses.length; i++) { - if (baseClasses[i] === iface) { + for (i = 0; i < interfaces.length; i++) { + if (interfaces[i] === iface) { return true; } } - for (i = 0; i < baseClasses.length; i++) { - if (isInheritanceFromInterface(baseClasses[i].$metadata$, iface)) { + for (i = 0; i < interfaces.length; i++) { + if (isInheritanceFromInterface(interfaces[i].$metadata$, iface)) { return true; } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 141652dcfeb..f7426a424e1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -97,7 +97,7 @@ public final class Namer { public static final String LOCAL_MODULE_PREFIX = "$module$"; public static final String METADATA = "$metadata$"; - public static final String METADATA_SUPERTYPES = "baseClasses"; + public static final String METADATA_SUPERTYPES = "interfaces"; public static final String METADATA_SIMPLE_NAME = "simpleName"; public static final String METADATA_CLASS_KIND = "kind"; public static final String CLASS_KIND_ENUM = "Kind";