Skip to content

Commit 3cf12f6

Browse files
committed
isEmpty should avoid using length
1 parent bd25cca commit 3cf12f6

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Source/String.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,13 @@ public struct SwiftString /*: Streamable*/ {
193193
}
194194

195195
public var isEmpty : Bool {
196-
return RemObjects.Elements.System.length(nativeStringValue) == 0
196+
#if JAVA
197+
return nativeStringValue.isEmpty()
198+
#elseif CLR || ISLAND
199+
return NativeString.IsNullOrEmpty(nativeStringValue)
200+
#elseif COCOA
201+
return nativeStringValue.length == 0
202+
#endif
197203
}
198204

199205
public func lowercased() -> SwiftString {

Source/String_Extensions.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,22 @@
105105
}
106106

107107
public var isEmpty : Bool {
108-
return length() == 0
108+
#if JAVA
109+
return self.isEmpty()
110+
#elseif CLR || ISLAND
111+
return String.IsNullOrEmpty(self)
112+
#elseif COCOA
113+
return length == 0
114+
#endif
109115
}
110116

111117
public func lowercased() -> NativeString {
112118
#if JAVA
113119
return self.toLowerCase()
114-
#elseif TOFFEE
115-
return self.lowercaseString
116120
#elseif CLR || ISLAND
117121
return self.ToLower()
122+
#elseif COCOA
123+
return self.lowercaseString
118124
#endif
119125
}
120126

0 commit comments

Comments
 (0)