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

Delete Hashable, pull up its members to Any

Browse Source 
Extensions on nullable types remain in Library.kt

 #KT-1741 Obsolete
 #KT-2805 Obsolete
 #KT-1365 Fixed
 #KT-4517 In Progress
This commit is contained in:
Alexander Udalov
2014-02-04 19:54:06 +04:00
parent 9efdd136ba
commit ec30d52978
46 changed files with 210 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/builtins/progressions.kt
+2 -2
View File
@@ -71,10 +71,10 @@ class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) {
override fun iterator(): ${t}Iterator = ${t}ProgressionIterator(start, end, increment)
fun equals(other: Any?): Boolean =
override fun equals(other: Any?): Boolean =
other is $progression && ${compare("start")} && ${compare("end")} && ${compare("increment")}
fun hashCode(): Int $hashCode
override fun hashCode(): Int $hashCode
fun toString(): String = ${"if (increment > 0) \"\$start..\$end step \$increment\" else \"\$start downTo \$end step \${-increment}\""}
}""")
generators/src/org/jetbrains/jet/generators/builtins/ranges.kt
+2 -2
View File
@@ -66,10 +66,10 @@ class GenerateRanges(out: PrintWriter) : BuiltInsSourceGenerator(out) {
override fun iterator(): ${t}Iterator = ${t}ProgressionIterator(start, end, $increment)
fun equals(other: Any?): Boolean =
override fun equals(other: Any?): Boolean =
other is $range && ${compare("start")} && ${compare("end")}
fun hashCode(): Int $hashCode
override fun hashCode(): Int $hashCode
class object {
public val EMPTY: $range = $range($emptyBounds)