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

rename Jet* classes to Kt*

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-19 18:43:17 +02:00
parent 660972b12d
commit 49033e0002
1965 changed files with 23732 additions and 23757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
+8 -8
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.KtType
import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.utils.Printer
import java.io.File
@@ -47,8 +47,8 @@ fun generate(): String {
p.println("/** This file is generated by org.jetbrains.kotlin.generators.evaluate:generate(). DO NOT MODIFY MANUALLY */")
p.println()
val unaryOperationsMap = arrayListOf<Triple<String, List<JetType>, Boolean>>()
val binaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
val unaryOperationsMap = arrayListOf<Triple<String, List<KtType>, Boolean>>()
val binaryOperationsMap = arrayListOf<Pair<String, List<KtType>>>()
val builtIns = TargetPlatform.Default.builtIns
@Suppress("UNCHECKED_CAST")
@@ -122,7 +122,7 @@ fun generate(): String {
return sb.toString()
}
fun renderCheckUnaryOperation(name: String, params: List<JetType>): String {
fun renderCheckUnaryOperation(name: String, params: List<KtType>): String {
val isAllParamsIntegers = params.fold(true) { a, b -> a && b.isIntegerType() }
if (!isAllParamsIntegers) {
return "emptyUnaryFun"
@@ -134,7 +134,7 @@ fun renderCheckUnaryOperation(name: String, params: List<JetType>): String {
}
}
fun renderCheckBinaryOperation(name: String, params: List<JetType>): String {
fun renderCheckBinaryOperation(name: String, params: List<KtType>): String {
val isAllParamsIntegers = params.fold(true) { a, b -> a && b.isIntegerType() }
if (!isAllParamsIntegers) {
return "emptyBinaryFun"
@@ -153,7 +153,7 @@ fun renderCheckBinaryOperation(name: String, params: List<JetType>): String {
}
}
private fun JetType.isIntegerType(): Boolean {
private fun KtType.isIntegerType(): Boolean {
return KotlinBuiltIns.isInt(this) ||
KotlinBuiltIns.isShort(this) ||
KotlinBuiltIns.isByte(this) ||
@@ -161,7 +161,7 @@ private fun JetType.isIntegerType(): Boolean {
}
private fun CallableDescriptor.getParametersTypes(): List<JetType> {
private fun CallableDescriptor.getParametersTypes(): List<KtType> {
val list = arrayListOf((getContainingDeclaration() as ClassDescriptor).getDefaultType())
getValueParameters().map { it.getType() }.forEach {
list.add(TypeUtils.makeNotNullable(it))
@@ -169,4 +169,4 @@ private fun CallableDescriptor.getParametersTypes(): List<JetType> {
return list
}
private fun JetType.asString(): String = getConstructor().getDeclarationDescriptor()!!.getName().asString().toUpperCase()
private fun KtType.asString(): String = getConstructor().getDeclarationDescriptor()!!.getName().asString().toUpperCase()
generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
+7 -7
View File
@@ -20,8 +20,8 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.lexer.KtKeywordToken;
import org.jetbrains.kotlin.lexer.KtTokens;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;
@@ -54,11 +54,11 @@ public class GenerateKeywordStrings {
p.pushIndent();
List<String> strings = new ArrayList<String>();
for (IElementType type : JetTokens.KEYWORDS.getTypes()) {
assert type instanceof JetKeywordToken : "Not a keyword in JetTokens.KEYWORDS: " + type;
JetKeywordToken keyword = (JetKeywordToken) type;
assert !keyword.isSoft() : "Soft keyword in JetTokens.KEYWORDS: " + keyword.getValue();
if (keyword != JetTokens.AS_SAFE && keyword != JetTokens.NOT_IN && keyword != JetTokens.NOT_IS) {
for (IElementType type : KtTokens.KEYWORDS.getTypes()) {
assert type instanceof KtKeywordToken : "Not a keyword in KtTokens.KEYWORDS: " + type;
KtKeywordToken keyword = (KtKeywordToken) type;
assert !keyword.isSoft() : "Soft keyword in KtTokens.KEYWORDS: " + keyword.getValue();
if (keyword != KtTokens.AS_SAFE && keyword != KtTokens.NOT_IN && keyword != KtTokens.NOT_IS) {
strings.add(keyword.getValue());
}
}
generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
+2 -2
View File
@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.generators.tests.reservedWords
import com.google.dart.compiler.backend.js.ast.JsFunctionScope
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.renderer.KeywordStringsGenerated
import java.io.File
val MODIFIER_KEYWORDS = JetTokens.MODIFIER_KEYWORDS_ARRAY.map { it.getValue() }.toSet()
val MODIFIER_KEYWORDS = KtTokens.MODIFIER_KEYWORDS_ARRAY.map { it.getValue() }.toSet()
val commonCases: CaseBuilder.(String, String) -> Unit = { testByName, testByRef ->
case("val", "val $KEYWORD_MARKER: Int", " = 0", testByName)