KJS: rename baseClass field in metadata to interfaces since we plan to store there only implemented interfaces (see KT-15037)

This commit is contained in:
Zalim Bashorov
2017-01-27 16:20:52 +03:00
parent 1b8b6bea43
commit d5dca38d68
3 changed files with 7 additions and 7 deletions
@@ -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: {},
+5 -5
View File
@@ -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;
}
}
@@ -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";