Commit 117094a8 by Daniel Dahan

can compile Swift 2.3

parent 9a90a7d5
///* /*
//* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>. * Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
//* All rights reserved. * All rights reserved.
//* *
//* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
//* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
//* *
//* * Redistributions of source code must retain the above copyright notice, this * * Redistributions of source code must retain the above copyright notice, this
//* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
//* *
//* * Redistributions in binary form must reproduce the above copyright notice, * * Redistributions in binary form must reproduce the above copyright notice,
//* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
//* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
//* *
//* * Neither the name of CosmicMind nor the names of its * * Neither the name of CosmicMind nor the names of its
//* contributors may be used to endorse or promote products derived from * contributors may be used to endorse or promote products derived from
//* this software without specific prior written permission. * this software without specific prior written permission.
//* *
//* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
//* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
//* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
//* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
//* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
//* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
//* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
//* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
//* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
//* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//*/ */
//
//import UIKit import UIKit
//
//public extension String { public extension String {
// /** /**
// :name: lines :name: lines
// */ */
// public var lines: Array<String> { public var lines: Array<String> {
// return componentsSeparatedByCharactersInSet(NSCharacterSet.newlineCharacterSet()) return components(separatedBy: CharacterSet.newlines)
// } }
//
// /** /**
// :name: firstLine :name: firstLine
// */ */
// public var firstLine: String? { public var firstLine: String? {
// return lines.first?.trim() return lines.first?.trim()
// } }
//
// /** /**
// :name: lastLine :name: lastLine
// */ */
// public var lastLine: String? { public var lastLine: String? {
// return lines.last?.trim() return lines.last?.trim()
// } }
//
// /** /**
// :name: replaceNewLineCharater :name: replaceNewLineCharater
// */ */
// public func replaceNewLineCharater(replace: String = " ") -> String { public func replaceNewLineCharater(separator: String = " ") -> String {
// return componentsSeparatedByCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()).joinWithSeparator(replace).trim() return components(separatedBy: CharacterSet.whitespaces).joined(separator: separator).trim()
// } }
//
// /** /**
// :name: replacePunctuationCharacters :name: replacePunctuationCharacters
// */ */
// public func replacePunctuationCharacters(replace: String = "") -> String { public func replacePunctuationCharacters(separator: String = "") -> String {
// return componentsSeparatedByCharactersInSet(NSCharacterSet.punctuationCharacterSet()).joinWithSeparator(replace).trim() return components(separatedBy: CharacterSet.punctuation).joined(separator: separator).trim()
// } }
//
// /** /**
// :name: trim :name: trim
// */ */
// public func trim() -> String { public func trim() -> String {
// return stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()) return trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
// } }
//} }
...@@ -97,8 +97,8 @@ public class Text : NSObject { ...@@ -97,8 +97,8 @@ public class Text : NSObject {
/// An Array of matches that match the pattern expression. /// An Array of matches that match the pattern expression.
public var matches: Array<String> { public var matches: Array<String> {
return textStorage.expression!.matchesInString(string, options: [], range: NSMakeRange(0, string.utf16.count)).map { return textStorage.expression!.matches(in: string, options: [], range: NSMakeRange(0, string.utf16.count)).map {
(self.string as NSString).substringWithRange($0.range).trim() (self.string as NSString).substring(with: $0.range).trim()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment