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

JS backend: removed parameters from PatternBuilder#receiverExists.

Browse Source
This commit is contained in:
develar
2013-08-08 19:51:49 +04:00
committed by Zalim Bashorov
parent 185ec381e3
commit 3e2d030e5d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
+3 -3
View File
@@ -29,9 +29,9 @@ public final class StringOperationFIF extends CompositeFIF {
add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt")); add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
add(pattern("jet", "String", "<get-length>"), LENGTH_PROPERTY_INTRINSIC); add(pattern("jet", "String", "<get-length>"), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "<get-size>").receiverExists(true), LENGTH_PROPERTY_INTRINSIC); add(pattern("js", "<get-size>").receiverExists(), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "length").receiverExists(true), LENGTH_PROPERTY_INTRINSIC); add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC);
add(pattern("jet", "CharSequence", "<get-length>"), LENGTH_PROPERTY_INTRINSIC); add(pattern("jet", "CharSequence", "<get-length>"), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "isEmpty").receiverExists(true), IS_EMPTY_INTRINSIC); add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC);
} }
} }
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
+4 -4
View File
@@ -118,12 +118,12 @@ public final class TopLevelFIF extends CompositeFIF {
public static final FunctionIntrinsicFactory INSTANCE = new TopLevelFIF(); public static final FunctionIntrinsicFactory INSTANCE = new TopLevelFIF();
private TopLevelFIF() { private TopLevelFIF() {
add(pattern("jet", "toString").receiverExists(true), new KotlinFunctionIntrinsic("toString")); add(pattern("jet", "toString").receiverExists(), new KotlinFunctionIntrinsic("toString"));
add(pattern("jet", "equals").receiverExists(true), EQUALS); add(pattern("jet", "equals").receiverExists(), EQUALS);
add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), EQUALS); add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), EQUALS);
add(pattern("String|Boolean|Char|Number.equals"), EQUALS); add(pattern("String|Boolean|Char|Number.equals"), EQUALS);
add(pattern("jet", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray")); 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() { add(new DescriptorPredicate() {
@Override @Override
public boolean apply(@NotNull FunctionDescriptor descriptor) { public boolean apply(@NotNull FunctionDescriptor descriptor) {
@@ -160,7 +160,7 @@ public final class TopLevelFIF extends CompositeFIF {
); );
String[] javaUtil = {"java", "util"}; 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("jet", "Map", "get"), NATIVE_MAP_GET);
add(pattern(javaUtil, "HashMap", "get"), NATIVE_MAP_GET); add(pattern(javaUtil, "HashMap", "get"), NATIVE_MAP_GET);
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+2 -2
View File
@@ -146,8 +146,8 @@ public final class PatternBuilder {
this.names = names; this.names = names;
} }
public DescriptorPredicateImpl receiverExists(boolean receiverParameterExists) { public DescriptorPredicateImpl receiverExists() {
this.receiverParameterExists = receiverParameterExists; this.receiverParameterExists = true;
return this; return this;
} }