JS backend: minor -- dropped some no longer necessary code.

This commit is contained in:
Zalim Bashorov
2014-03-07 15:21:43 +04:00
parent a3cd1bbfda
commit 3455f6adcd
3 changed files with 8 additions and 13 deletions
@@ -124,10 +124,6 @@ trait CallCase<I : CallInfo> {
callInfo.receiverArgument()
} else {
if (callInfo.receiverObject == null) {
// TODO remake UsageTracker and drop this hack
// this call need for usage tracker -- without it, capture this not worked
val alias = callInfo.context.getAliasForDescriptor(callInfo.callableDescriptor)
assert(alias == null, "Failed hack for usageTracker")
callInfo.thisObject()
} else
callInfo.bothReceivers()
@@ -34,29 +34,32 @@ public final class Namer {
public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
public static final String CALLEE_NAME = "$fun";
public static final String OUTER_CLASS_NAME = "$outer";
private static final String CALL_FUNCTION = "call";
private static final String APPLY_FUNCTION = "apply";
private static final String CLASS_OBJECT_NAME = "createClass";
private static final String TRAIT_OBJECT_NAME = "createTrait";
private static final String OBJECT_OBJECT_NAME = "createObject";
private static final String ENUM_ENTRIES_NAME = "createEnumEntries";
private static final String SETTER_PREFIX = "set_";
private static final String GETTER_PREFIX = "get_";
private static final String BACKING_FIELD_PREFIX = "$";
private static final String DELEGATE_POSTFIX = "$delegate";
private static final String SUPER_METHOD_NAME = "baseInitializer";
private static final String ROOT_PACKAGE = "_";
private static final String RECEIVER_PARAMETER_NAME = "$receiver";
private static final String THROW_NPE_FUN_NAME = "throwNPE";
private static final String CLASS_OBJECT_GETTER = "object";
private static final String CLASS_OBJECT_INITIALIZER = "object_initializer$";
private static final String PROTOTYPE_NAME = "prototype";
public static final String CAPTURED_VAR_FIELD = "v";
private static final String DELEGATE_POSTFIX = "$delegate";
@NotNull
public static String getReceiverParameterName() {
return RECEIVER_PARAMETER_NAME;
@@ -140,6 +143,7 @@ public final class Namer {
public static JsNameRef getFunctionCallRef(@NotNull JsExpression functionExpression) {
return new JsNameRef(CALL_FUNCTION, functionExpression);
}
@NotNull
public static JsNameRef getFunctionApplyRef(@NotNull JsExpression functionExpression) {
return new JsNameRef(APPLY_FUNCTION, functionExpression);
-5
View File
@@ -622,8 +622,3 @@ String.prototype.contains = function (s) {
return obj1;
};
})();
Kotlin.assignOwner = function (f, o) {
f.o = o;
return f;
};