a bit more methods (previously broke compilation)

This commit is contained in:
Alex Tkachman
2011-12-13 16:00:22 +02:00
parent ff055399a7
commit 3419df7d0c
+11 -15
View File
@@ -65,7 +65,7 @@ namespace io {
} }
})) }))
fun readLine() : String? = stdin.readLine() inline fun readLine() : String? = stdin.readLine()
fun InputStream.iterator() : ByteIterator = fun InputStream.iterator() : ByteIterator =
object: ByteIterator() { object: ByteIterator() {
@@ -75,29 +75,25 @@ namespace io {
override fun nextByte() = read().byt override fun nextByte() = read().byt
} }
val InputStream.buffered : BufferedInputStream inline fun InputStream.buffered(bufferSize: Int) = BufferedInputStream(this, bufferSize)
get() = if(this is BufferedInputStream) this else BufferedInputStream(this)
// inline fun InputStream.buffered(bufferSize: Int) = BufferedInputStream(this, bufferSize) inline val InputStream.reader : InputStreamReader
val InputStream.reader : InputStreamReader
get() = InputStreamReader(this) get() = InputStreamReader(this)
val InputStream.bufferedReader : BufferedReader inline val InputStream.bufferedReader : BufferedReader
get() = BufferedReader(reader) get() = BufferedReader(reader)
/*
inline fun InputStream.reader(charset: Charset) : InputStreamReader = InputStreamReader(this, charset) inline fun InputStream.reader(charset: Charset) : InputStreamReader = InputStreamReader(this, charset)
inline fun InputStream.reader(charsetName: String) = InputStreamReader(this, charsetNme) inline fun InputStream.reader(charsetName: String) = InputStreamReader(this, charsetName)
inline fun InputStream.reader(charset: Charset) = InputStreamReader(this, charset)
inline fun InputStream.reader(charsetDecoder: CharsetDecoder) = InputStreamReader(this, charsetDecoder) inline fun InputStream.reader(charsetDecoder: CharsetDecoder) = InputStreamReader(this, charsetDecoder)
*/
// val Reader.buffered : BufferedReader inline val InputStream.buffered : BufferedInputStream
// get() = if(this instanceof BufferedReader) this else BufferedReader(this) get() = if(this is BufferedInputStream) this else BufferedInputStream(this)
// inline fun Reader.buffered(bufferSize: Int) = BufferedReader(this, bufferSize) // inline val Reader.buffered : BufferedReader
// get() = if(this is BufferedReader) this else BufferedReader(this)
inline fun Reader.buffered(bufferSize: Int) = BufferedReader(this, bufferSize)
} }