Move exceptions to kotlin package in JS library, introduce type aliases for exceptions in kotlin package in JVM runtime.

#KT-18 Fixed
This commit is contained in:
Ilya Gorbunov
2016-06-28 20:57:35 +03:00
parent afe1b7eab1
commit 0d7819e011
7 changed files with 87 additions and 41 deletions
@@ -0,0 +1,34 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin
public typealias Error = java.lang.Error
public typealias Exception = java.lang.Exception
public typealias RuntimeException = java.lang.RuntimeException
public typealias IllegalArgumentException = java.lang.IllegalArgumentException
public typealias IllegalStateException = java.lang.IllegalStateException
public typealias IndexOutOfBoundsException = java.lang.IndexOutOfBoundsException
public typealias UnsupportedOperationException = java.lang.UnsupportedOperationException
public typealias NumberFormatException = java.lang.NumberFormatException
public typealias NullPointerException = java.lang.NullPointerException
public typealias ClassCastException = java.lang.ClassCastException
public typealias AssertionError = java.lang.AssertionError
// kotlin or kotlin.collections?
public typealias NoSuchElementException = java.util.NoSuchElementException
+53
View File
@@ -0,0 +1,53 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin
@library
public open class Error(message: String? = null) : Throwable(message) {}
@library
public open class Exception(message: String? = null) : Throwable(message) {}
@library
public open class RuntimeException(message: String? = null) : Exception(message) {}
@library
public open class IllegalArgumentException(message: String? = null) : RuntimeException(message) {}
@library
public open class IllegalStateException(message: String? = null) : RuntimeException(message) {}
@library
public open class IndexOutOfBoundsException(message: String? = null) : RuntimeException(message) {}
@library
public open class UnsupportedOperationException(message: String? = null) : RuntimeException(message) {}
@library
public open class NumberFormatException(message: String? = null) : RuntimeException(message) {}
@library
public open class NullPointerException(message: String? = null) : RuntimeException(message) {}
@library
public open class ClassCastException(message: String? = null) : RuntimeException(message) {}
@library
public open class AssertionError(message: String? = null) : Error(message) {}
@library
public open class NoSuchElementException(message: String? = null) : Exception() {}
-32
View File
@@ -16,38 +16,6 @@
package java.lang
@library
open public class Error(message: String? = null) : Throwable(message) {}
@library
open public class Exception(message: String? = null) : Throwable(message) {}
@library
open public class RuntimeException(message: String? = null) : Exception(message) {}
@library
public class IllegalArgumentException(message: String? = null) : RuntimeException(message) {}
@library
public class IllegalStateException(message: String? = null) : RuntimeException(message) {}
@library
public class IndexOutOfBoundsException(message: String? = null) : RuntimeException(message) {}
@library
public class UnsupportedOperationException(message: String? = null) : RuntimeException(message) {}
@library
public class NumberFormatException(message: String? = null) : RuntimeException(message) {}
@library
public class NullPointerException(message: String? = null) : RuntimeException(message) {}
@library
public class ClassCastException(message: String? = null) : RuntimeException(message) {}
@library
public class AssertionError(message: String? = null) : Error(message) {}
@library
public interface Runnable {
-2
View File
@@ -122,8 +122,6 @@ public open class LinkedHashMap<K, V>(
initialCapacity: Int = DEFAULT_INITIAL_CAPACITY, loadFactor: Float = DEFAULT_LOAD_FACTOR, accessOrder: Boolean = false
) : HashMap<K, V>(initialCapacity, loadFactor)
@library
public open class NoSuchElementException(message: String? = null) : Exception() {}
@native
public class Date() {
@@ -1,6 +1,5 @@
package kotlin.collections
import java.util.NoSuchElementException
private enum class State {
Ready,
@@ -20,9 +20,6 @@
package kotlin.text
import java.util.NoSuchElementException
import kotlin.text.MatchResult
import kotlin.text.Regex
/**
* Returns a sub sequence of this char sequence having leading and trailing characters matching the [predicate] trimmed.
@@ -2,9 +2,6 @@
@file:kotlin.jvm.JvmName("PreconditionsKt")
package kotlin
import java.lang.IllegalArgumentException
import java.lang.IllegalStateException
/**
* Throws an [IllegalArgumentException] if the [value] is false.
*/