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

Get rid of "jet" in comments, assertions, READMEs, etc.

Browse Source 
Replace with "kotlin"

 #KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-19 19:22:18 +04:00
parent 410b7985e1
commit ac71911720
18 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+3 -4
View File
@@ -40,7 +40,6 @@ import org.jetbrains.jet.lang.resolve.calls.util.ExpressionAsFunctionDescriptor;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassStaticsPackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
@@ -75,15 +74,15 @@ public class JetTypeMapper extends BindingTraceAware {
*/
IMPL,
/**
* jet.Int is mapped to I
* kotlin.Int is mapped to I
*/
VALUE,
/**
* jet.Int is mapped to Ljava/lang/Integer;
* kotlin.Int is mapped to Ljava/lang/Integer;
*/
TYPE_PARAMETER,
/**
* jet.Int is mapped to Ljava/lang/Integer;
* kotlin.Int is mapped to Ljava/lang/Integer;
* No projections allowed in immediate arguments
*/
SUPER_TYPE
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java
+4 -5
View File
@@ -25,7 +25,6 @@ import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.types.lang.PrimitiveType;
@@ -84,10 +83,10 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
/**
* E.g.
* jet.Throwable -> java.lang.Throwable
* jet.Deprecated -> java.lang.annotation.Deprecated
* jet.Int -> java.lang.Integer
* jet.IntArray -> null
* kotlin.Throwable -> java.lang.Throwable
* kotlin.deprecated -> java.lang.annotation.Deprecated
* kotlin.Int -> java.lang.Integer
* kotlin.IntArray -> null
*/
@Nullable
public FqName getKotlinToJavaFqName(@NotNull FqName fqName) {
compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java
+2 -2
View File
@@ -38,11 +38,11 @@ public class CastDiagnosticsUtil {
/**
* Two types are related, roughly, when one is a subtype or supertype of the other.
* <p/>
* Note that some types have platform-specific counterparts, i.e. jet.String is mapped to java.lang.String,
* Note that some types have platform-specific counterparts, i.e. kotlin.String is mapped to java.lang.String,
* such types (and all their sub- and supertypes) are related too.
* <p/>
* Due to limitations in PlatformToKotlinClassMap, we only consider mapping of platform classes to Kotlin classed
* (i.e. java.lang.String -> jet.String) and ignore mappings that go the other way.
* (i.e. java.lang.String -> kotlin.String) and ignore mappings that go the other way.
*/
private static boolean isRelated(@NotNull JetType a, @NotNull JetType b, @NotNull PlatformToKotlinClassMap platformToKotlinClassMap) {
List<JetType> aTypes = mapToPlatformIndependentTypes(a, platformToKotlinClassMap);
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
+2 -2
View File
@@ -41,8 +41,8 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.jet.utils.KotlinVfsUtil;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.File;
import java.net.MalformedURLException;
@@ -56,7 +56,7 @@ public class LightClassUtil {
/**
* Checks whether the given file is loaded from the location where Kotlin's built-in classes are defined.
* As of today, this is core/builtins/native/jet directory and files such as Any.kt, Nothing.kt etc.
* As of today, this is core/builtins/native/kotlin directory and files such as Any.kt, Nothing.kt etc.
*
* Used to skip JetLightClass creation for built-ins, because built-in classes have no Java counterparts
*/
compiler/tests/org/jetbrains/jet/FqNameTest.java
+17 -17
View File
@@ -39,48 +39,48 @@ public class FqNameTest {
@Test
public void pathLevel1() {
List<FqName> path = new FqName("com").path();
List<FqName> path = new FqName("org").path();
Assert.assertEquals(2, path.size());
Assert.assertEquals("", path.get(0).asString());
Assert.assertEquals("com", path.get(1).asString());
Assert.assertEquals("com", path.get(1).shortName().asString());
Assert.assertEquals("org", path.get(1).asString());
Assert.assertEquals("org", path.get(1).shortName().asString());
Assert.assertEquals("", path.get(1).parent().asString());
}
@Test
public void pathLevel2() {
List<FqName> path = new FqName("com.jetbrains").path();
List<FqName> path = new FqName("org.jetbrains").path();
Assert.assertEquals(3, path.size());
Assert.assertEquals("", path.get(0).asString());
Assert.assertEquals("com", path.get(1).asString());
Assert.assertEquals("com", path.get(1).shortName().asString());
Assert.assertEquals("org", path.get(1).asString());
Assert.assertEquals("org", path.get(1).shortName().asString());
Assert.assertEquals("", path.get(1).parent().asString());
Assert.assertEquals("com.jetbrains", path.get(2).asString());
Assert.assertEquals("org.jetbrains", path.get(2).asString());
Assert.assertEquals("jetbrains", path.get(2).shortName().asString());
Assert.assertEquals("com", path.get(2).parent().asString());
Assert.assertEquals("org", path.get(2).parent().asString());
}
@Test
public void pathLevel3() {
List<FqName> path = new FqName("com.jetbrains.jet").path();
List<FqName> path = new FqName("org.jetbrains.kotlin").path();
Assert.assertEquals(4, path.size());
Assert.assertEquals("", path.get(0).asString());
Assert.assertEquals("com", path.get(1).asString());
Assert.assertEquals("com", path.get(1).shortName().asString());
Assert.assertEquals("org", path.get(1).asString());
Assert.assertEquals("org", path.get(1).shortName().asString());
Assert.assertEquals("", path.get(1).parent().asString());
Assert.assertEquals("com.jetbrains", path.get(2).asString());
Assert.assertEquals("org.jetbrains", path.get(2).asString());
Assert.assertEquals("jetbrains", path.get(2).shortName().asString());
Assert.assertEquals("com", path.get(2).parent().asString());
Assert.assertEquals("com.jetbrains.jet", path.get(3).asString());
Assert.assertEquals("jet", path.get(3).shortName().asString());
Assert.assertEquals("com.jetbrains", path.get(3).parent().asString());
Assert.assertEquals("org", path.get(2).parent().asString());
Assert.assertEquals("org.jetbrains.kotlin", path.get(3).asString());
Assert.assertEquals("kotlin", path.get(3).shortName().asString());
Assert.assertEquals("org.jetbrains", path.get(3).parent().asString());
}
@Test
public void pathSegments() {
Assert.assertEquals(Lists.newArrayList(), new FqName("").pathSegments());
for (String name : new String[] { "com", "com.jetbrains", "com.jetbrains.jet" }) {
for (String name : new String[] { "org", "org.jetbrains", "org.jetbrains.kotlin" }) {
List<Name> segments = new FqName(name).pathSegments();
List<String> segmentsStrings = new ArrayList<String>();
for (Name segment : segments) {
compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java
+21 -20
View File
@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.jetbrains.jet.codegen.CodegenTestUtil.assertIsCurrentTime;
@@ -194,37 +195,37 @@ public class PackageGenTest extends CodegenTestCase {
public void testJavaEquals() throws Exception {
loadText("fun foo(s1: String, s2: String) = s1 == s2");
Method main = generateFunction();
assertEquals(Boolean.TRUE, main.invoke(null, new String("jet"), new String("jet")));
assertEquals(Boolean.FALSE, main.invoke(null, new String("jet"), new String("ceylon")));
assertEquals(Boolean.TRUE, main.invoke(null, new String("kotlin"), new String("kotlin")));
assertEquals(Boolean.FALSE, main.invoke(null, new String("kotlin"), new String("ceylon")));
}
public void testJavaNotEquals() throws Exception {
loadText("fun foo(s1: String, s2: String) = s1 != s2");
Method main = generateFunction();
assertEquals(Boolean.FALSE, main.invoke(null, new String("jet"), new String("jet")));
assertEquals(Boolean.TRUE, main.invoke(null, new String("jet"), new String("ceylon")));
assertEquals(Boolean.FALSE, main.invoke(null, new String("kotlin"), new String("kotlin")));
assertEquals(Boolean.TRUE, main.invoke(null, new String("kotlin"), new String("ceylon")));
}
public void testJavaEqualsNull() throws Exception {
loadText("fun foo(s1: String?, s2: String?) = s1 == s2");
Method main = generateFunction();
assertEquals(Boolean.TRUE, main.invoke(null, null, null));
assertEquals(Boolean.FALSE, main.invoke(null, "jet", null));
assertEquals(Boolean.FALSE, main.invoke(null, null, "jet"));
assertEquals(Boolean.FALSE, main.invoke(null, "kotlin", null));
assertEquals(Boolean.FALSE, main.invoke(null, null, "kotlin"));
}
public void testEqualsNullLiteral() throws Exception {
loadText("fun foo(s: String?) = s == null");
Method main = generateFunction();
assertEquals(Boolean.TRUE, main.invoke(null, new Object[] { null }));
assertEquals(Boolean.FALSE, main.invoke(null, "jet"));
assertEquals(Boolean.FALSE, main.invoke(null, "kotlin"));
}
public void testTripleEq() throws Exception {
loadText("fun foo(s1: String?, s2: String?) = s1 === s2");
Method main = generateFunction();
String s1 = new String("jet");
String s2 = new String("jet");
String s1 = new String("kotlin");
String s2 = new String("kotlin");
assertEquals(Boolean.TRUE, main.invoke(null, s1, s1));
assertEquals(Boolean.FALSE, main.invoke(null, s1, s2));
}
@@ -232,8 +233,8 @@ public class PackageGenTest extends CodegenTestCase {
public void testTripleNotEq() throws Exception {
loadText("fun foo(s1: String?, s2: String?) = s1 !== s2");
Method main = generateFunction();
String s1 = new String("jet");
String s2 = new String("jet");
String s1 = new String("kotlin");
String s2 = new String("kotlin");
assertEquals(Boolean.FALSE, main.invoke(null, s1, s1));
assertEquals(Boolean.TRUE, main.invoke(null, s1, s2));
}
@@ -247,7 +248,7 @@ public class PackageGenTest extends CodegenTestCase {
public void testStringPlus() throws Exception {
loadText("fun foo(s1: String, s2: String) = s1 + s2");
Method main = generateFunction();
assertEquals("jetLang", main.invoke(null, "jet", "Lang"));
assertEquals("kotlinLang", main.invoke(null, "kotlin", "Lang"));
}
public void testStringPlusChained() throws Exception {
@@ -256,7 +257,7 @@ public class PackageGenTest extends CodegenTestCase {
int firstStringBuilderCreation = text.indexOf("NEW java/lang/StringBuilder");
assertEquals(-1, text.indexOf("NEW java/lang/StringBuilder", firstStringBuilderCreation + 1));
Method main = generateFunction();
assertEquals("jet Lang", main.invoke(null, "jet", " ", "Lang"));
assertEquals("kotlin Lang", main.invoke(null, "kotlin", " ", "Lang"));
}
public void testStringPlusEq() throws Exception {
@@ -269,13 +270,13 @@ public class PackageGenTest extends CodegenTestCase {
loadText("fun foo(s1: String, s2: String) = s1 < s2");
Method main = generateFunction();
assertEquals(Boolean.TRUE, main.invoke(null, "Ceylon", "Java"));
assertEquals(Boolean.FALSE, main.invoke(null, "Jet", "Java"));
assertEquals(Boolean.FALSE, main.invoke(null, "Kotlin", "Java"));
}
public void testElvis() throws Exception {
loadText("fun foo(s: String?) = s ?: \"null\"");
Method main = generateFunction();
assertEquals("jet", main.invoke(null, "jet"));
assertEquals("kotlin", main.invoke(null, "kotlin"));
assertEquals("null", main.invoke(null, new Object[] { null }));
}
@@ -289,7 +290,7 @@ public class PackageGenTest extends CodegenTestCase {
public void testVarargs() throws Exception {
loadText("fun foo() = java.util.Arrays.asList(\"IntelliJ\", \"IDEA\")");
Method main = generateFunction();
java.util.List<?> list = (java.util.List<?>) main.invoke(null);
List<?> list = (List<?>) main.invoke(null);
assertEquals(Arrays.asList("IntelliJ", "IDEA"), list);
}
@@ -339,11 +340,11 @@ public class PackageGenTest extends CodegenTestCase {
}
public void testArrayWrite() throws Exception {
loadText("fun foo(c: Array<String>) { c[0] = \"jet\"; }");
loadText("fun foo(c: Array<String>) { c[0] = \"kotlin\"; }");
Method main = generateFunction();
String[] array = new String[] { null };
main.invoke(null, new Object[] { array });
assertEquals("jet", array[0]);
assertEquals("kotlin", array[0]);
}
public void testArrayAugAssign() throws Exception {
@@ -450,12 +451,12 @@ public class PackageGenTest extends CodegenTestCase {
}
public void testArrayAccessForArrayList() throws Exception {
loadText("import java.util.*; fun foo(l: ArrayList<String>) { l[0] = \"Jet\" + l[0]; }");
loadText("import java.util.*; fun foo(l: ArrayList<String>) { l[0] = \"Kotlin\" + l[0]; }");
Method main = generateFunction();
ArrayList<String> list = new ArrayList<String>();
list.add("Language");
main.invoke(null, list);
assertEquals("JetLanguage", list.get(0));
assertEquals("KotlinLanguage", list.get(0));
}
public void testEscapeSequence() throws Exception {
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
// </item>
//
// KAnnotator produces above annotations and validation of TabularDataSupport results into:
// public open fun keySet(): jet.MutableSet<jet.Any> defined in javax.management.openmbean.TabularDataSupport :
// public open fun keySet(): kotlin.MutableSet<kotlin.Any> defined in javax.management.openmbean.TabularDataSupport :
// [Incompatible types in superclasses: [Any?, Any, Any], Incompatible projection kinds in type arguments of super methods' return types: [out Any?, Any, Any]]
private static final Set<String> classesToIgnore = new HashSet<String>(Arrays.asList("javax.management.openmbean.TabularDataSupport"));