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

Packages: move Ranges, Progression, ProgressionIterators to kotlin.ranges and PrimitiveIterators to kotlin.collections.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-23 21:37:29 +03:00
parent a3efa1ea6c
commit 9fbbc9db98
18 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt
+7 -7
View File
@@ -18,21 +18,21 @@ package org.jetbrains.kotlin.js.descriptorUtils
import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.utils.addToStdlib.check
val KotlinType.nameIfStandardType: Name?
get() {
val descriptor = constructor.declarationDescriptor
if (descriptor?.containingDeclaration == descriptor?.builtIns?.builtInsPackageFragment) {
return descriptor?.name
}
return null
return constructor.declarationDescriptor
?.check { descriptor ->
descriptor.builtIns.isBuiltInPackageFragment(descriptor.containingDeclaration as? PackageFragmentDescriptor)
}
?.name
}
fun KotlinType.getJetTypeFqName(printTypeArguments: Boolean): String {
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java
+6 -6
View File
@@ -98,15 +98,15 @@ public final class StandardClasses {
if (type == PrimitiveType.CHAR || type == PrimitiveType.LONG) continue;
String typeName = type.getTypeName().asString();
standardClasses.declare().forFQ("kotlin." + typeName + "Range").kotlinClass("NumberRange");
standardClasses.declare().forFQ("kotlin." + typeName + "Progression").kotlinClass("NumberProgression");
standardClasses.declare().forFQ("kotlin.ranges." + typeName + "Range").kotlinClass("NumberRange");
standardClasses.declare().forFQ("kotlin.ranges." + typeName + "Progression").kotlinClass("NumberProgression");
}
standardClasses.declare().forFQ("kotlin.LongRange").kotlinClass("LongRange");
standardClasses.declare().forFQ("kotlin.CharRange").kotlinClass("CharRange");
standardClasses.declare().forFQ("kotlin.ranges.LongRange").kotlinClass("LongRange");
standardClasses.declare().forFQ("kotlin.ranges.CharRange").kotlinClass("CharRange");
standardClasses.declare().forFQ("kotlin.LongProgression").kotlinClass("LongProgression");
standardClasses.declare().forFQ("kotlin.CharProgression").kotlinClass("CharProgression");
standardClasses.declare().forFQ("kotlin.ranges.LongProgression").kotlinClass("LongProgression");
standardClasses.declare().forFQ("kotlin.ranges.CharProgression").kotlinClass("CharProgression");
standardClasses.declare().forFQ("kotlin.Enum").kotlinClass("Enum");
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ProgressionCompanionFIF.kt
+1 -1
View File
@@ -34,7 +34,7 @@ object ProgressionCompanionFIF : CompositeFIF() {
add(methodPattern("CharProgression"), CallProgressionConstructorIntrinsic("CharProgression"))
}
private fun methodPattern(builtinProgressionName: String) = pattern("kotlin", builtinProgressionName, "Companion", "fromClosedRange")
private fun methodPattern(builtinProgressionName: String) = pattern("kotlin.ranges", builtinProgressionName, "Companion", "fromClosedRange")
private class CallProgressionConstructorIntrinsic(val libraryProgressionName: String) : FunctionIntrinsic() {
override fun apply(receiver: JsExpression?, arguments: MutableList<JsExpression>, context: TranslationContext): JsExpression
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
+1 -1
View File
@@ -156,7 +156,7 @@ public final class JsDescriptorUtils {
public static boolean isBuiltin(@NotNull DeclarationDescriptor descriptor) {
PackageFragmentDescriptor containingPackageFragment = DescriptorUtils.getParentOfType(descriptor, PackageFragmentDescriptor.class);
return containingPackageFragment == org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns(descriptor).getBuiltInsPackageFragment();
return org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns(descriptor).isBuiltInPackageFragment(containingPackageFragment);
}
@Nullable
js/js.translator/testData/kotlin_lib.js
Vendored
+3 -3
View File
@@ -888,7 +888,7 @@
lazyInitClasses.NumberRange = Kotlin.createClass(
function() {
return [Kotlin.modules['builtins'].kotlin.ClosedRange, Kotlin.NumberProgression]
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.NumberProgression]
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, 1);
@@ -976,7 +976,7 @@
lazyInitClasses.LongRange = Kotlin.createClass(
function () {
return [Kotlin.modules['builtins'].kotlin.ClosedRange, Kotlin.LongProgression];
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.LongProgression];
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, Kotlin.Long.ONE);
@@ -1058,7 +1058,7 @@
lazyInitClasses.CharRange = Kotlin.createClass(
function() {
return [Kotlin.modules['builtins'].kotlin.ClosedRange, Kotlin.CharProgression]
return [Kotlin.modules['builtins'].kotlin.ranges.ClosedRange, Kotlin.CharProgression]
},
function $fun(start, endInclusive) {
$fun.baseInitializer.call(this, start, endInclusive, 1);