Fixer for more unified kqueue/epoll based NetEvent. Removed ICU depen…

…dency

Former-commit-id: 3654b2c

Sources/PerfectLib/HTTPServer.swift

@@ -595,7 +595,7 @@ public class HTTPServer {
 					let headerKey = transformHeaderName(UTF8Encoding.encode(h[h.startIndex..<i]))
 					var i2 = i + 1
 					while i2 < h.endIndex {
-						if !ICU.isWhiteSpace(UnicodeScalar(h[i2])) {
+						if !UnicodeScalar(h[i2]).isWhiteSpace() {
 							break
 						}
 						i2 += 1
@@ -617,7 +617,7 @@ public class HTTPServer {
 				return false
 			}
 			for i in 0..<h.count {
-				if !ICU.isWhiteSpace(UnicodeScalar(h[i])) {
+				if !UnicodeScalar(h[i]).isWhiteSpace() {
 					let extens = UTF8Encoding.encode(h[i..<h.count])
 					self.requestParams[self.lastHeaderKey] = found + " " + extens
 					return true
@@ -660,7 +660,7 @@ public class HTTPServer {
 					if segment.count == 0 {
 						callback(true)
 						return
-					} else if ICU.isWhiteSpace(UnicodeScalar(segment.first!)) {
+					} else if UnicodeScalar(segment.first!).isWhiteSpace() {
 						if !self.processHeaderContinuation(segment) {
 							callback(false)
 							return

Sources/PerfectLib/Mustache.swift

@@ -17,8 +17,6 @@
 //===----------------------------------------------------------------------===//
 //
 
-import ICU
-
 let mustacheExtension = "mustache"
 
 enum MustacheTagType {
@@ -734,7 +732,7 @@ public class MustacheParser {
 		var scalars = s.unicodeScalars
 		var idx = scalars.endIndex.predecessor()
 
-		while ICU.isWhiteSpace(scalars[idx]) {
+		while scalars[idx].isWhiteSpace() {
 			scalars.remove(at: idx)
 			idx = idx.predecessor()
 		}
@@ -745,7 +743,7 @@ public class MustacheParser {
 	func skipWhiteSpace() -> UnicodeScalar? {
 		var e = next()
 		while e != nil {
-			if !ICU.isWhiteSpace(e!) {
+			if !(e!).isWhiteSpace() {
 				return e
 			}
 			e = next()
@@ -763,20 +761,20 @@ public class MustacheParser {
 			while true {
 
 				e = next()
-				if e != nil && !ICU.isWhiteSpace(e!) {
+				if e != nil && !(e!).isWhiteSpace() {
 					openD.append(e!)
 				} else {
 					break
 				}
 			}
 
-			guard e != nil && ICU.isWhiteSpace(e!) else {
+			guard e != nil && (e!).isWhiteSpace() else {
 				throw MustacheError.SyntaxError(errorMsg)
 			}
 
 			e = skipWhiteSpace()
 
-			guard e != nil && !ICU.isWhiteSpace(e!) else {
+			guard e != nil && !(e!).isWhiteSpace() else {
 				throw MustacheError.SyntaxError(errorMsg)
 			}
 
@@ -785,14 +783,14 @@ public class MustacheParser {
 			while true {
 
 				e = next()
-				if e != nil && !ICU.isWhiteSpace(e!) && e! != "=" {
+				if e != nil && !(e!).isWhiteSpace() && e! != "=" {
 					closeD.append(e!)
 				} else {
 					break
 				}
 			}
 
-			if e != nil && ICU.isWhiteSpace(e!) {
+			if e != nil && (e!).isWhiteSpace() {
 				e = skipWhiteSpace()
 				guard e != nil && e! == "=" else {
 					throw MustacheError.SyntaxError(errorMsg)