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

JS backend: mangling functions for extension properties.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-10-01 22:39:49 +04:00
parent 9b04e3e3fe
commit 9fabdf4587
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
+2 -2
View File
@@ -279,7 +279,7 @@ public final class StaticContext {
return declarePropertyOrPropertyAccessorName(descriptor, nameFromAnnotation, false); return declarePropertyOrPropertyAccessorName(descriptor, nameFromAnnotation, false);
} }
String propertyName = propertyDescriptor.getName().asString(); String propertyName = getSuggestedName(propertyDescriptor);
if (!isExtension(propertyDescriptor)) { if (!isExtension(propertyDescriptor)) {
if (propertyDescriptor.getVisibility() == Visibilities.PRIVATE) { if (propertyDescriptor.getVisibility() == Visibilities.PRIVATE) {
@@ -288,7 +288,7 @@ public final class StaticContext {
return declarePropertyOrPropertyAccessorName(descriptor, propertyName, false); return declarePropertyOrPropertyAccessorName(descriptor, propertyName, false);
} else { } else {
if (descriptor instanceof PropertyDescriptor) { if (descriptor instanceof PropertyDescriptor) {
return declarePropertyOrPropertyAccessorName(descriptor, propertyName, true); return declarePropertyOrPropertyAccessorName(descriptor, propertyName, false);
} else { } else {
String propertyJsName = getNameForDescriptor(propertyDescriptor).getIdent(); String propertyJsName = getNameForDescriptor(propertyDescriptor).getIdent();
boolean isGetter = descriptor instanceof PropertyGetterDescriptor; boolean isGetter = descriptor instanceof PropertyGetterDescriptor;
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java
+2 -2
View File
@@ -97,8 +97,8 @@ public final class JsDescriptorUtils {
return containing; return containing;
} }
public static boolean isExtension(@NotNull CallableDescriptor functionDescriptor) { public static boolean isExtension(@NotNull CallableDescriptor descriptor) {
return (functionDescriptor.getExtensionReceiverParameter() != null); return (descriptor.getExtensionReceiverParameter() != null);
} }
public static boolean isOverride(@NotNull CallableMemberDescriptor descriptor) { public static boolean isOverride(@NotNull CallableMemberDescriptor descriptor) {
js/js.translator/src/org/jetbrains/k2js/translate/utils/ManglingUtils.java
+28 -25
View File
@@ -35,7 +35,7 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.getJetTypeFqNa
public class ManglingUtils { public class ManglingUtils {
private ManglingUtils() {} private ManglingUtils() {}
public static final Comparator<FunctionDescriptor> OVERLOADED_FUNCTION_COMPARATOR = new OverloadedFunctionComparator(); public static final Comparator<CallableMemberDescriptor> OVERLOADED_MEMBER_COMPARATOR = new OverloadedMemberComparator();
@NotNull @NotNull
public static String getMangledName(@NotNull PropertyDescriptor descriptor, @NotNull String suggestedName) { public static String getMangledName(@NotNull PropertyDescriptor descriptor, @NotNull String suggestedName) {
@@ -46,15 +46,17 @@ public class ManglingUtils {
public static String getSuggestedName(@NotNull DeclarationDescriptor descriptor) { public static String getSuggestedName(@NotNull DeclarationDescriptor descriptor) {
String suggestedName = descriptor.getName().asString(); String suggestedName = descriptor.getName().asString();
if (descriptor instanceof FunctionDescriptor) { if (descriptor instanceof FunctionDescriptor ||
suggestedName = getMangledName((FunctionDescriptor) descriptor); descriptor instanceof PropertyDescriptor && JsDescriptorUtils.isExtension((PropertyDescriptor) descriptor)
) {
suggestedName = getMangledName((CallableMemberDescriptor) descriptor);
} }
return suggestedName; return suggestedName;
} }
@NotNull @NotNull
private static String getMangledName(@NotNull FunctionDescriptor descriptor) { private static String getMangledName(@NotNull CallableMemberDescriptor descriptor) {
if (needsStableMangling(descriptor)) { if (needsStableMangling(descriptor)) {
return getStableMangledName(descriptor); return getStableMangledName(descriptor);
} }
@@ -63,7 +65,7 @@ public class ManglingUtils {
} }
//TODO extend logic for nested/inner declarations //TODO extend logic for nested/inner declarations
private static boolean needsStableMangling(FunctionDescriptor descriptor) { private static boolean needsStableMangling(CallableMemberDescriptor descriptor) {
// Use stable mangling for overrides because we use stable mangling when any function inside a overridable declaration // Use stable mangling for overrides because we use stable mangling when any function inside a overridable declaration
// for avoid clashing names when inheritance. // for avoid clashing names when inheritance.
if (JsDescriptorUtils.isOverride(descriptor)) { if (JsDescriptorUtils.isOverride(descriptor)) {
@@ -84,7 +86,7 @@ public class ManglingUtils {
} }
// valueOf() is created in the library with a mangled name for every enum class // valueOf() is created in the library with a mangled name for every enum class
if (CodegenUtil.isEnumValueOfMethod(descriptor)) { if (descriptor instanceof FunctionDescriptor && CodegenUtil.isEnumValueOfMethod((FunctionDescriptor) descriptor)) {
return true; return true;
} }
@@ -123,12 +125,12 @@ public class ManglingUtils {
} }
@NotNull @NotNull
private static String getStableMangledName(@NotNull FunctionDescriptor descriptor) { private static String getStableMangledName(@NotNull CallableDescriptor descriptor) {
return getStableMangledName(descriptor.getName().asString(), getArgumentTypesAsString(descriptor)); return getStableMangledName(descriptor.getName().asString(), getArgumentTypesAsString(descriptor));
} }
@NotNull @NotNull
private static String getSimpleMangledName(@NotNull final FunctionDescriptor descriptor) { private static String getSimpleMangledName(@NotNull final CallableMemberDescriptor descriptor) {
DeclarationDescriptor declaration = descriptor.getContainingDeclaration(); DeclarationDescriptor declaration = descriptor.getContainingDeclaration();
JetScope jetScope = null; JetScope jetScope = null;
@@ -143,30 +145,31 @@ public class ManglingUtils {
if (jetScope != null) { if (jetScope != null) {
Collection<DeclarationDescriptor> declarations = jetScope.getAllDescriptors(); Collection<DeclarationDescriptor> declarations = jetScope.getAllDescriptors();
List<FunctionDescriptor> List<CallableMemberDescriptor>
overloadedFunctions = ContainerUtil.mapNotNull(declarations, new Function<DeclarationDescriptor, FunctionDescriptor>() { overloadedFunctions = ContainerUtil.mapNotNull(declarations, new Function<DeclarationDescriptor, CallableMemberDescriptor>() {
@Override @Override
public FunctionDescriptor fun(DeclarationDescriptor declarationDescriptor) { public CallableMemberDescriptor fun(DeclarationDescriptor declarationDescriptor) {
if (!(declarationDescriptor instanceof FunctionDescriptor)) return null; if (!(declarationDescriptor instanceof CallableMemberDescriptor)) return null;
FunctionDescriptor functionDescriptor = (FunctionDescriptor) declarationDescriptor; CallableMemberDescriptor callableMemberDescriptor = (CallableMemberDescriptor) declarationDescriptor;
String name = AnnotationsUtils.getNameForAnnotatedObjectWithOverrides(functionDescriptor); String name = AnnotationsUtils.getNameForAnnotatedObjectWithOverrides(callableMemberDescriptor);
// when name == null it's mean that it's not native. // when name == null it's mean that it's not native.
if (name == null) { if (name == null) {
// skip functions without arguments, because we don't use mangling for them // skip functions without arguments, because we don't use mangling for them
if (needsStableMangling(functionDescriptor) && !functionDescriptor.getValueParameters().isEmpty()) return null; if (needsStableMangling(callableMemberDescriptor) && !callableMemberDescriptor.getValueParameters().isEmpty()) return null;
name = declarationDescriptor.getName().asString(); // TODO add prefix for property: get_$name and set_$name
name = callableMemberDescriptor.getName().asString();
} }
return descriptor.getName().asString().equals(name) ? functionDescriptor : null; return descriptor.getName().asString().equals(name) ? callableMemberDescriptor : null;
} }
}); });
if (overloadedFunctions.size() > 1) { if (overloadedFunctions.size() > 1) {
Collections.sort(overloadedFunctions, OVERLOADED_FUNCTION_COMPARATOR); Collections.sort(overloadedFunctions, OVERLOADED_MEMBER_COMPARATOR);
counter = ContainerUtil.indexOfIdentity(overloadedFunctions, descriptor); counter = ContainerUtil.indexOfIdentity(overloadedFunctions, descriptor);
assert counter >= 0; assert counter >= 0;
} }
@@ -176,7 +179,7 @@ public class ManglingUtils {
return counter == 0 ? name : name + '_' + counter; return counter == 0 ? name : name + '_' + counter;
} }
private static String getArgumentTypesAsString(FunctionDescriptor descriptor) { private static String getArgumentTypesAsString(CallableDescriptor descriptor) {
StringBuilder argTypes = new StringBuilder(); StringBuilder argTypes = new StringBuilder();
ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter(); ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter();
@@ -201,9 +204,9 @@ public class ManglingUtils {
return getSuggestedName(functions.iterator().next()); return getSuggestedName(functions.iterator().next());
} }
private static class OverloadedFunctionComparator implements Comparator<FunctionDescriptor> { private static class OverloadedMemberComparator implements Comparator<CallableMemberDescriptor> {
@Override @Override
public int compare(@NotNull FunctionDescriptor a, @NotNull FunctionDescriptor b) { public int compare(@NotNull CallableMemberDescriptor a, @NotNull CallableMemberDescriptor b) {
// native functions first // native functions first
if (isNativeOrOverrideNative(a)) { if (isNativeOrOverrideNative(a)) {
if (!isNativeOrOverrideNative(b)) return -1; if (!isNativeOrOverrideNative(b)) return -1;
@@ -230,15 +233,15 @@ public class ManglingUtils {
return aArguments.compareTo(bArguments); return aArguments.compareTo(bArguments);
} }
private static int arity(FunctionDescriptor descriptor) { private static int arity(CallableMemberDescriptor descriptor) {
return descriptor.getValueParameters().size() + (descriptor.getExtensionReceiverParameter() == null ? 0 : 1); return descriptor.getValueParameters().size() + (descriptor.getExtensionReceiverParameter() == null ? 0 : 1);
} }
private static boolean isNativeOrOverrideNative(FunctionDescriptor descriptor) { private static boolean isNativeOrOverrideNative(CallableMemberDescriptor descriptor) {
if (AnnotationsUtils.isNativeObject(descriptor)) return true; if (AnnotationsUtils.isNativeObject(descriptor)) return true;
Set<FunctionDescriptor> declarations = OverrideResolver.getAllOverriddenDeclarations(descriptor); Set<CallableMemberDescriptor> declarations = OverrideResolver.getAllOverriddenDeclarations(descriptor);
for (FunctionDescriptor memberDescriptor : declarations) { for (CallableMemberDescriptor memberDescriptor : declarations) {
if (AnnotationsUtils.isNativeObject(memberDescriptor)) return true; if (AnnotationsUtils.isNativeObject(memberDescriptor)) return true;
} }
return false; return false;