Skip to content

Commit c67e7a3

Browse files
committed
work on #11
1 parent 472ba50 commit c67e7a3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

SwiftIO/SwiftRegex.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class SwiftRegex: NSObject, BooleanType {
4343
}
4444

4545
final var targetRange: NSRange {
46-
return NSRange(location: 0,length: countElements(target))
46+
return NSRange(location: 0,length: target.utf16Count)
4747
}
4848

4949
final func substring(range: NSRange) -> String? {
@@ -102,7 +102,7 @@ public class SwiftRegex: NSObject, BooleanType {
102102
let mut = NSMutableString(string: target)
103103
mut.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement)
104104

105-
target = mut
105+
target = mut as String
106106
}
107107
}
108108
}
@@ -154,7 +154,7 @@ public class SwiftRegex: NSObject, BooleanType {
154154

155155
out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!)
156156

157-
return out
157+
return out as String
158158
}
159159

160160
public var boolValue: Bool {
@@ -206,4 +206,4 @@ public func ~= (left: SwiftRegex, right: ([String]?) -> String) -> String {
206206
return left.substituteMatches({match, stop -> String in
207207
return right(left.groupsForMatch(match))
208208
}, options: nil)
209-
}
209+
}

0 commit comments

Comments
 (0)