Merge pull request #12 from mhavu/string

Some String changes

Author: dwarfland

Source/String.swift

@@ -1,4 +1,4 @@
-#if JAVA
+#if JAVA
 public typealias NativeString = java.lang.String
 public typealias NativeStringBuilder = java.lang.StringBuilder
 #elseif CLR
@@ -24,7 +24,7 @@ public struct SwiftString /*: Streamable*/ {
 		nativeStringValue = ""
 	}
 
-	public init(count: Int, repeatedValue c: Char) {
+	public init(repeating c: Char, count: Int) {
 
 		#if JAVA || ISLAND
 		var chars = Char[](count)
@@ -40,7 +40,7 @@ public struct SwiftString /*: Streamable*/ {
 	}
 
 	public convenience init(_ c: Char) {
-		init(count: 1, repeatedValue: c)
+        init(repeating: c, count: 1)
 	}
 
 	public init(_ s: NativeString) {
@@ -232,16 +232,20 @@ public struct SwiftString /*: Streamable*/ {
 		return SwiftString.UTF8View(string: nativeStringValue)
 	}
 
-	#if COCOA
 	public var utf8CString: UTF8Char[] {
+        #if CLR
+        let result = System.Text.Encoding.UTF8.GetBytes(nativeStringValue)
+        #elseif ISLAND
+        let result = RemObjects.Elements.System.Encoding.UTF8.GetBytes(nativeStringValue, false)
+        #elseif COCOA
 		let utf8 = nativeStringValue.cStringUsingEncoding(.UTF8StringEncoding)
-		let len = strlen(utf8)+1
+		let len = strlen(utf8) + 1
 		let result = UTF8Char[](len)
 		memcpy(result, utf8, len)
-		return result
+        #endif
+        return result
 	}
-	#endif
-
+	
 	public var utf16: SwiftString.UTF16View {
 		return SwiftString.UTF16View(string: nativeStringValue)
 	}
@@ -430,4 +434,4 @@ public struct SwiftString /*: Streamable*/ {
 		return nil
 		#endif
 	}
-}
+}

Source/String_Extensions.swift

@@ -1,8 +1,8 @@
-public extension NativeString : Streamable {
+public extension NativeString : Streamable {
 
 	typealias Index = Int
 
-	public init(count: Int, repeatedValue c: Char) {
+	public init(repeating c: Char, count: Int) {
 
 		#if JAVA || ISLAND
 		var chars = Char[](count)
@@ -18,7 +18,7 @@
 	}
 
 	public init(_ c: Char) {
-		return NativeString(count: 1, repeatedValue: c)
+        return NativeString(repeating: c, count: 1)
 	}
 
 	public init(_ object:  Object) {
@@ -333,4 +333,4 @@
 		return nil
 		#endif
 	}
-}
+}