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

Merge pull request #15 from chirino/master

Browse Source 
stdlib enhancements around String conversions.
This commit is contained in:
James Strachan
2012-03-08 22:48:51 -08:00
parent c2000c5312 b8dda416f3
commit bdcdf93650
7 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/Arrays.kt
+11
View File
@@ -3,6 +3,7 @@ package kotlin
import java.io.ByteArrayInputStream
import java.util.Arrays
import java.nio.charset.Charset
// Array "constructor"
inline fun <T> array(vararg t : T) : Array<T> = t
@@ -101,6 +102,16 @@ inline val ByteArray.inputStream : ByteArrayInputStream
inline fun ByteArray.inputStream(offset: Int, length: Int) = ByteArrayInputStream(this, offset, length)
inline fun ByteArray.toString(encoding: String?):String {
if(encoding==null) {
return String(this, encoding)
} else {
return String(this)
}
}
inline fun ByteArray.toString(encoding: Charset) = String(this, encoding)
/** Returns true if the array is not empty */
inline fun <T> Array<T>.notEmpty() : Boolean = !this.isEmpty()
libraries/stdlib/src/JavaIo.kt
+41 -34
View File
@@ -155,11 +155,11 @@ get() = InputStreamReader(this)
inline val InputStream.bufferedReader : BufferedReader
get() = BufferedReader(reader)
inline fun InputStream.reader(charset: Charset) : InputStreamReader = InputStreamReader(this, charset)
inline fun InputStream.reader(encoding: Charset) : InputStreamReader = InputStreamReader(this, encoding)
inline fun InputStream.reader(charsetName: String) = InputStreamReader(this, charsetName)
inline fun InputStream.reader(encoding: String) = InputStreamReader(this, encoding)
inline fun InputStream.reader(charsetDecoder: CharsetDecoder) = InputStreamReader(this, charsetDecoder)
inline fun InputStream.reader(encoding: CharsetDecoder) = InputStreamReader(this, encoding)
inline val InputStream.buffered : BufferedInputStream
get() = if(this is BufferedInputStream) this else BufferedInputStream(this)
@@ -289,22 +289,13 @@ fun File.relativePath(descendant: File): String {
}
}
/**
* Reads the entire content of the file as a String
*
* This method is not recommended on huge files.
*/
fun File.readText(encoding: String = defaultCharset): String {
return readBytes().toString(encoding)
}
/**
* Reads the entire content of the file as bytes
*
* This method is not recommended on huge files.
*/
fun File.readBytes(): ByteArray {
return FileInputStream(this).use<FileInputStream,ByteArray>{ it.readBytes() }
return FileInputStream(this).use<FileInputStream,ByteArray>{ it.readBytes(this.length().toInt()) }
}
/**
@@ -313,13 +304,36 @@ fun File.readBytes(): ByteArray {
fun File.writeBytes(data: ByteArray): Unit {
return FileOutputStream(this).use<FileOutputStream,Unit>{ it.write(data) }
}
/**
* Reads the entire content of the file as a String using the optional
* character encoding. The default platform encoding is used if the character
* encoding is not specified or null.
*
* This method is not recommended on huge files.
*/
fun File.readText(encoding:String? = null) = readBytes().toString(encoding)
/**
* Writes the text as the contents of the file
* Reads the entire content of the file as a String using the
* character encoding.
*
* This method is not recommended on huge files.
*/
fun File.writeText(text: String): Unit {
return FileWriter(this).use<FileWriter,Unit>{ it.write(text) }
}
fun File.readText(encoding:Charset) = readBytes().toString(encoding)
/**
* Writes the text as the contents of the file using the optional
* character encoding. The default platform encoding is used if the character
* encoding is not specified or null.
*/
fun File.writeText(text: String, encoding:String?=null): Unit { writeBytes(text.toByteArray(encoding)) }
/**
* Writes the text as the contents of the file using the optional
* character encoding. The default platform encoding is used if the character
* encoding is not specified or null.
*/
fun File.writeText(text: String, encoding:Charset): Unit { writeBytes(text.toByteArray(encoding)) }
/**
* Copies this file to the given output file, returning the number of bytes copied
@@ -340,8 +354,8 @@ fun File.copyTo(file: File, bufferSize: Int = defaultBufferSize): Long {
*
* **Note** it is the callers responsibility to close this resource
*/
fun InputStream.readBytes(): ByteArray {
val buffer = ByteArrayOutputStream()
fun InputStream.readBytes(estimatedSize: Int = defaultBufferSize): ByteArray {
val buffer = ByteArrayOutputStream(estimatedSize)
this.copyTo(buffer)
return buffer.toByteArray().sure()
}
@@ -353,8 +367,8 @@ fun InputStream.readBytes(): ByteArray {
*/
fun Reader.readText(): String {
val buffer = StringWriter()
this.copyTo(buffer)
return buffer.toString() ?: ""
copyTo(buffer)
return buffer.toString().sure()
}
/**
@@ -374,7 +388,6 @@ fun InputStream.copyTo(out: OutputStream, bufferSize: Int = defaultBufferSize):
return bytesCopied
}
/**
* Copies this reader to the given output writer, returning the number of bytes copied.
*
@@ -392,30 +405,24 @@ fun Reader.copyTo(out: Writer, bufferSize: Int = defaultBufferSize): Long {
return charsCopied
}
/**
* Reads the entire content of the URL as a String with an optional character set name
*
* This method is not recommended on huge files.
*/
fun URL.readText(encoding: String = defaultCharset): String {
val bytes = readBytes()
return bytes.toString(encoding)
}
fun URL.readText(encoding: String? = null): String = readBytes().toString(encoding)
/**
* Converts the bytes to a [[String]] using the given encoding or uses the [[defaultCharset]] (UTF-8)
* Reads the entire content of the URL as a String with the specified character encoding.
*
* This method is not recommended on huge files.
*/
fun ByteArray.toString(encoding: String = defaultCharset): String {
return if (encoding != null) String(this, encoding) else String(this)
}
fun URL.readText(encoding: Charset): String = readBytes().toString(encoding)
/**
* Reads the entire content of the URL as bytes
*
* This method is not recommended on huge files.
*/
fun URL.readBytes(): ByteArray {
return this.openStream().sure().use<InputStream,ByteArray>{ it.readBytes() }
}
fun URL.readBytes(): ByteArray = this.openStream().sure().use<InputStream,ByteArray>{ it.readBytes() }
libraries/stdlib/src/String.kt
+16
View File
@@ -97,6 +97,22 @@ inline fun String(stringBuilder : java.lang.StringBuilder) = java.lang.String(st
/** Returns true if the string is not null and not empty */
inline fun String?.notEmpty() : Boolean = this != null && this.length() > 0
inline fun String.toByteArray(encoding: String?=null):ByteArray {
if(encoding==null) {
return (this as java.lang.String).getBytes().sure()
} else {
return (this as java.lang.String).getBytes(encoding).sure()
}
}
inline fun String.toByteArray(encoding: java.nio.charset.Charset):ByteArray = (this as java.lang.String).getBytes(encoding).sure()
inline fun String.toBoolean() = java.lang.Boolean.parseBoolean(this).sure()
inline fun String.toShort() = java.lang.Short.parseShort(this).sure()
inline fun String.toInt() = java.lang.Integer.parseInt(this).sure()
inline fun String.toLong() = java.lang.Long.parseLong(this).sure()
inline fun String.toFloat() = java.lang.Float.parseFloat(this).sure()
inline fun String.toDouble() = java.lang.Double.parseDouble(this).sure()
/**
Iterator for characters of given CharSequence
*/