diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java index d887325b450..cc1b55c961c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java @@ -29,9 +29,9 @@ public final class StringOperationFIF extends CompositeFIF { add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt")); add(pattern("jet", "String", ""), LENGTH_PROPERTY_INTRINSIC); - add(pattern("js", "").receiverExists(true), LENGTH_PROPERTY_INTRINSIC); - add(pattern("js", "length").receiverExists(true), LENGTH_PROPERTY_INTRINSIC); + add(pattern("js", "").receiverExists(), LENGTH_PROPERTY_INTRINSIC); + add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC); add(pattern("jet", "CharSequence", ""), LENGTH_PROPERTY_INTRINSIC); - add(pattern("js", "isEmpty").receiverExists(true), IS_EMPTY_INTRINSIC); + add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java index 32cb2b66979..44344d6a3df 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -118,12 +118,12 @@ public final class TopLevelFIF extends CompositeFIF { public static final FunctionIntrinsicFactory INSTANCE = new TopLevelFIF(); private TopLevelFIF() { - add(pattern("jet", "toString").receiverExists(true), new KotlinFunctionIntrinsic("toString")); - add(pattern("jet", "equals").receiverExists(true), EQUALS); + add(pattern("jet", "toString").receiverExists(), new KotlinFunctionIntrinsic("toString")); + add(pattern("jet", "equals").receiverExists(), EQUALS); add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), EQUALS); add(pattern("String|Boolean|Char|Number.equals"), EQUALS); add(pattern("jet", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray")); - add(pattern("jet", "iterator").receiverExists(true), RETURN_RECEIVER_INTRINSIC); + add(pattern("jet", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC); add(new DescriptorPredicate() { @Override public boolean apply(@NotNull FunctionDescriptor descriptor) { @@ -160,7 +160,7 @@ public final class TopLevelFIF extends CompositeFIF { ); String[] javaUtil = {"java", "util"}; - add(pattern(javaUtil, "set").receiverExists(true), NATIVE_MAP_SET); + add(pattern(javaUtil, "set").receiverExists(), NATIVE_MAP_SET); add(pattern("jet", "Map", "get"), NATIVE_MAP_GET); add(pattern(javaUtil, "HashMap", "get"), NATIVE_MAP_GET); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index 7119c24d85d..7f0da2dd43a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -146,8 +146,8 @@ public final class PatternBuilder { this.names = names; } - public DescriptorPredicateImpl receiverExists(boolean receiverParameterExists) { - this.receiverParameterExists = receiverParameterExists; + public DescriptorPredicateImpl receiverExists() { + this.receiverParameterExists = true; return this; }