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

Unsorted replacements "jet" -> "kotlin"

Browse Source 
#KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-19 21:34:06 +04:00
parent ac71911720
commit 6b0fce8cd5
22 changed files with 185 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+6 -6
View File
@@ -87,20 +87,20 @@ public final class StandardClasses {
@NotNull
public static StandardClasses bindImplementations(@NotNull JsScope kotlinObjectScope) {
StandardClasses standardClasses = new StandardClasses(kotlinObjectScope);
declareJetObjects(standardClasses);
declareKotlinStandardClasses(standardClasses);
return standardClasses;
}
private static void declareJetObjects(@NotNull StandardClasses standardClasses) {
standardClasses.declare().forFQ("jet.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
private static void declareKotlinStandardClasses(@NotNull StandardClasses standardClasses) {
standardClasses.declare().forFQ("kotlin.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
standardClasses.declare().forFQ("jet.IntRange").kotlinClass("NumberRange")
standardClasses.declare().forFQ("kotlin.IntRange").kotlinClass("NumberRange")
.methods("iterator", "contains").properties("start", "end", "increment");
standardClasses.declare().forFQ("jet.IntProgression").kotlinClass("NumberProgression")
standardClasses.declare().forFQ("kotlin.IntProgression").kotlinClass("NumberProgression")
.methods("iterator", "contains").properties("start", "end", "increment");
standardClasses.declare().forFQ("jet.Enum").kotlinClass("Enum");
standardClasses.declare().forFQ("kotlin.Enum").kotlinClass("Enum");
}
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
+1 -1
View File
@@ -26,7 +26,7 @@ public final class StringOperationFIF extends CompositeFIF {
public static final FunctionIntrinsicFactory INSTANCE = new StringOperationFIF();
private StringOperationFIF() {
add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
add(pattern("kotlin", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC);
}
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
+8 -8
View File
@@ -46,7 +46,7 @@ import static org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionInt
import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
public final class TopLevelFIF extends CompositeFIF {
public static final DescriptorPredicate EQUALS_IN_ANY = pattern("jet", "Any", "equals");
public static final DescriptorPredicate EQUALS_IN_ANY = pattern("kotlin", "Any", "equals");
@NotNull
public static final KotlinFunctionIntrinsic KOTLIN_EQUALS = new KotlinFunctionIntrinsic("equals");
@NotNull
@@ -141,16 +141,16 @@ public final class TopLevelFIF extends CompositeFIF {
private TopLevelFIF() {
add(EQUALS_IN_ANY, KOTLIN_EQUALS);
add(pattern("jet", "toString").receiverExists(), TO_STRING);
add(pattern("jet", "equals").receiverExists(), KOTLIN_EQUALS);
add(pattern("jet", "identityEquals").receiverExists(), IDENTITY_EQUALS);
add(pattern("kotlin", "toString").receiverExists(), TO_STRING);
add(pattern("kotlin", "equals").receiverExists(), KOTLIN_EQUALS);
add(pattern("kotlin", "identityEquals").receiverExists(), IDENTITY_EQUALS);
add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), KOTLIN_EQUALS);
add(pattern("String|Boolean|Char|Number.equals"), KOTLIN_EQUALS);
add(pattern("jet", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray"));
add(pattern("jet", "PropertyMetadataImpl", "<init>"), PROPERTY_METADATA_IMPL);
add(pattern("jet", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC);
add(pattern("kotlin", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray"));
add(pattern("kotlin", "PropertyMetadataImpl", "<init>"), PROPERTY_METADATA_IMPL);
add(pattern("kotlin", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC);
add(pattern("jet", "Map", "get").checkOverridden(), NATIVE_MAP_GET);
add(pattern("kotlin", "Map", "get").checkOverridden(), NATIVE_MAP_GET);
add(pattern("js", "set").receiverExists(), NATIVE_MAP_SET);
add(pattern("java.util", "HashMap", "<init>"), new MapSelectImplementationIntrinsic(false));
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+2 -2
View File
@@ -30,7 +30,7 @@ import java.util.List;
public final class PatternBuilder {
@NotNull
private static final NamePredicate JET = new NamePredicate("jet");
private static final NamePredicate KOTLIN_NAME_PREDICATE = new NamePredicate("kotlin");
@NotNull
private static final Name KOTLIN_NAME = Name.identifier(Namer.KOTLIN_LOWER_NAME);
@@ -74,7 +74,7 @@ public final class PatternBuilder {
assert !checkers.isEmpty();
final List<NamePredicate> checkersWithPrefixChecker = Lists.newArrayList();
if (!checkers.get(0).apply(KOTLIN_NAME)) {
checkersWithPrefixChecker.add(JET);
checkersWithPrefixChecker.add(KOTLIN_NAME_PREDICATE);
}
checkersWithPrefixChecker.addAll(checkers);