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

Cleanup: apply "Convert lambda to reference"

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-02-22 16:12:01 +03:00
parent b121bf8802
commit 045a23ae10
82 changed files with 117 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt
+2 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.getNameForAnnotatedObject
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject
import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic
@@ -85,7 +86,7 @@ class NameSuggestion {
is PackageFragmentDescriptor -> {
return if (!descriptor.fqName.isRoot) {
SuggestedName(descriptor.fqName.pathSegments().map { it.asString() }, true, descriptor,
SuggestedName(descriptor.fqName.pathSegments().map(Name::asString), true, descriptor,
descriptor.containingDeclaration)
}
else {
js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
+1 -1
View File
@@ -66,7 +66,7 @@ class FunctionReader(private val context: TranslationContext) {
init {
val config = context.config as LibrarySourcesConfig
val libs = config.libraries.map { File(it) }
val libs = config.libraries.map(::File)
JsLibraryUtils.traverseJsLibraries(libs) { fileContent, _ ->
var current = 0
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt
+1 -1
View File
@@ -228,7 +228,7 @@ private fun moveCapturedLocalInside(capturingFunction: JsFunction, capturedName:
val scope = capturingFunction.getInnerFunction()?.scope!!
val freshNames = getTemporaryNamesInScope(scope, capturedArgs)
val aliasCallArguments = freshNames.map { it.makeRef() }
val aliasCallArguments = freshNames.map(JsName::makeRef)
val alias = JsInvocation(localFunAlias.qualifier, aliasCallArguments)
declareAliasInsideFunction(capturingFunction, capturedName, alias)
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt
+2 -2
View File
@@ -89,9 +89,9 @@ object LongOperationFIF : FunctionIntrinsicFactory {
LONG_EQUALS_ANY.apply(descriptor) || LONG_BINARY_OPERATION_LONG.apply(descriptor) || LONG_BIT_SHIFTS.apply(descriptor) ->
longBinaryIntrinsics[operationName]
INTEGER_BINARY_OPERATION_LONG.apply(descriptor) ->
wrapIntrinsicIfPresent(longBinaryIntrinsics[operationName], { longFromInt(it) }, ID())
wrapIntrinsicIfPresent(longBinaryIntrinsics[operationName], ::longFromInt, ID())
LONG_BINARY_OPERATION_INTEGER.apply(descriptor) ->
wrapIntrinsicIfPresent(longBinaryIntrinsics[operationName], ID(), { longFromInt(it) })
wrapIntrinsicIfPresent(longBinaryIntrinsics[operationName], ID(), ::longFromInt)
FLOATING_POINT_BINARY_OPERATION_LONG.apply(descriptor) ->
wrapIntrinsicIfPresent(floatBinaryIntrinsics[operationName], ID(), { invokeMethod(it, Namer.LONG_TO_NUMBER) })
LONG_BINARY_OPERATION_FLOATING_POINT.apply(descriptor) ->
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt
+7 -7
View File
@@ -33,14 +33,14 @@ object NumberAndCharConversionFIF : CompositeFIF() {
private val convertOperations: Map<String, ConversionUnaryIntrinsic> =
mapOf(
"Float|Double.toInt" to ConversionUnaryIntrinsic { toInt32(it) },
"Int|Float|Double.toShort" to ConversionUnaryIntrinsic { toShort(it) },
"Short|Int|Float|Double.toByte" to ConversionUnaryIntrinsic { toByte(it) },
"Float|Double.toInt" to ConversionUnaryIntrinsic(::toInt32),
"Int|Float|Double.toShort" to ConversionUnaryIntrinsic(::toShort),
"Short|Int|Float|Double.toByte" to ConversionUnaryIntrinsic(::toByte),
"Int|Short|Byte.toLong" to ConversionUnaryIntrinsic { longFromInt(it) },
"Float|Double.toLong" to ConversionUnaryIntrinsic { longFromNumber(it) },
"Int|Short|Byte.toLong" to ConversionUnaryIntrinsic(::longFromInt),
"Float|Double.toLong" to ConversionUnaryIntrinsic(::longFromNumber),
"Char.toDouble|toFloat|toInt" to ConversionUnaryIntrinsic { charToInt(it) },
"Char.toDouble|toFloat|toInt" to ConversionUnaryIntrinsic(::charToInt),
"Char.toShort" to ConversionUnaryIntrinsic { toShort(charToInt(it)) },
"Char.toByte" to ConversionUnaryIntrinsic { toByte(charToInt(it)) },
"Char.toLong" to ConversionUnaryIntrinsic { longFromInt(charToInt(it)) },
@@ -52,7 +52,7 @@ object NumberAndCharConversionFIF : CompositeFIF() {
"Number.toFloat|toDouble" to ConversionUnaryIntrinsic { invokeKotlinFunction("numberToDouble", it) },
"Number.toLong" to ConversionUnaryIntrinsic { invokeKotlinFunction("numberToLong", it) },
"Int|Short|Byte|Float|Double.toChar" to ConversionUnaryIntrinsic { toChar(it) },
"Int|Short|Byte|Float|Double.toChar" to ConversionUnaryIntrinsic(::toChar),
"Long.toFloat|toDouble" to ConversionUnaryIntrinsic { invokeMethod(it, "toNumber") },
"Long.toInt" to ConversionUnaryIntrinsic { invokeMethod(it, "toInt") },
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt
+2 -2
View File
@@ -64,9 +64,9 @@ object LongCompareToBOIF : BinaryOperationIntrinsicFactory {
}
}
private val INTEGER_COMPARE_TO_LONG = CompareToBinaryIntrinsic( { longFromInt(it) }, ID())
private val INTEGER_COMPARE_TO_LONG = CompareToBinaryIntrinsic(::longFromInt, ID())
private val CHAR_COMPARE_TO_LONG = CompareToBinaryIntrinsic( { longFromInt(charToInt(it)) }, ID())
private val LONG_COMPARE_TO_INTEGER = CompareToBinaryIntrinsic( ID(), { longFromInt(it) })
private val LONG_COMPARE_TO_INTEGER = CompareToBinaryIntrinsic(ID(), ::longFromInt)
private val LONG_COMPARE_TO_CHAR = CompareToBinaryIntrinsic( ID(), { longFromInt(charToInt(it)) })
private val LONG_COMPARE_TO_LONG = CompareToBinaryIntrinsic( ID(), ID() )