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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
js/js.libraries/src/js/callableReferenceUtils.js
+1 -1
View File
@@ -54,7 +54,7 @@ var propertyRefClassMetadataCache = [
function getPropertyRefMetadata(cache) { function getPropertyRefMetadata(cache) {
if (cache.value === null) { if (cache.value === null) {
cache.value = { cache.value = {
baseClasses: [cache.implementedInterface()], interfaces: [cache.implementedInterface()],
baseClass: null, baseClass: null,
functions: {}, functions: {},
properties: {}, properties: {},
js/js.libraries/src/js/rtti.js
+5 -5
View File
@@ -55,15 +55,15 @@ Kotlin.callSetter = function (thisObject, klass, propertyName, value) {
function isInheritanceFromInterface(metadata, iface) { function isInheritanceFromInterface(metadata, iface) {
if (metadata == null) return false; if (metadata == null) return false;
var baseClasses = metadata.baseClasses; var interfaces = metadata.interfaces;
var i; var i;
for (i = 0; i < baseClasses.length; i++) { for (i = 0; i < interfaces.length; i++) {
if (baseClasses[i] === iface) { if (interfaces[i] === iface) {
return true; return true;
} }
} }
for (i = 0; i < baseClasses.length; i++) { for (i = 0; i < interfaces.length; i++) {
if (isInheritanceFromInterface(baseClasses[i].$metadata$, iface)) { if (isInheritanceFromInterface(interfaces[i].$metadata$, iface)) {
return true; return true;
} }
} }
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java
+1 -1
View File
@@ -97,7 +97,7 @@ public final class Namer {
public static final String LOCAL_MODULE_PREFIX = "$module$"; public static final String LOCAL_MODULE_PREFIX = "$module$";
public static final String METADATA = "$metadata$"; 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_SIMPLE_NAME = "simpleName";
public static final String METADATA_CLASS_KIND = "kind"; public static final String METADATA_CLASS_KIND = "kind";
public static final String CLASS_KIND_ENUM = "Kind"; public static final String CLASS_KIND_ENUM = "Kind";