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

isError() implemented for lazy java types

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-24 13:49:54 +04:00
parent 03a9c776b2
commit 089352b525
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyType.kt
+3 -1
View File
@@ -22,6 +22,8 @@ import org.jetbrains.jet.lang.types.TypeProjection
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.types.AbstractJetType import org.jetbrains.jet.lang.types.AbstractJetType
import org.jetbrains.jet.lang.types.ErrorUtils
import org.jetbrains.kotlin.util.inn
abstract class LazyType(storageManager: StorageManager) : AbstractJetType() { abstract class LazyType(storageManager: StorageManager) : AbstractJetType() {
@@ -42,7 +44,7 @@ abstract class LazyType(storageManager: StorageManager) : AbstractJetType() {
override fun isNullable() = false override fun isNullable() = false
override fun isError() = false override fun isError()= getConstructor().getDeclarationDescriptor().inn({ d -> ErrorUtils.isError(d)}, false)
override fun getAnnotations(): List<AnnotationDescriptor> = listOf() override fun getAnnotations(): List<AnnotationDescriptor> = listOf()
} }
core/util.runtime/src/org/jetbrains/jet/utils/coreLib.kt
+2
View File
@@ -18,6 +18,8 @@ package org.jetbrains.kotlin.util
fun Boolean.iif<T>(then: T, _else: T): T = if (this) then else _else fun Boolean.iif<T>(then: T, _else: T): T = if (this) then else _else
fun <T: Any, R> T?.inn(then: (T) -> R, _else: R): R = if (this != null) then(this) else _else
// These two functions are needed in conjunction with iif: // These two functions are needed in conjunction with iif:
// foo.eq(bar).iif(a, b) // foo.eq(bar).iif(a, b)
fun <T> T.eq(eq: T): Boolean = this == eq fun <T> T.eq(eq: T): Boolean = this == eq