From b275c75614ffb5c5471f43e76d8769780f51620a Mon Sep 17 00:00:00 2001
From: Nabil Chatbi <scinfu@gmail.com>
Date: Wed, 14 Dec 2016 12:41:01 +0100
Subject: [PATCH 1/2] speed improvement

---
 Sources/CharacterReader.swift          |  88 ++++---
 Sources/String.swift                   |   4 +
 SwiftSoup.xcodeproj/project.pbxproj    | 308 ++++++++++++-------------
 Tests/helperTests/StringUtilTest.swift |  23 +-
 Tests/textTests/SwiftSoupTests.swift   |  20 +-
 5 files changed, 240 insertions(+), 203 deletions(-)

diff --git a/Sources/CharacterReader.swift b/Sources/CharacterReader.swift
index 7cc27e9..960898c 100644
--- a/Sources/CharacterReader.swift
+++ b/Sources/CharacterReader.swift
@@ -15,7 +15,7 @@ public final class CharacterReader
 {
     public static let EOF : UnicodeScalar = "\u{FFFF}"//65535
     private static let maxCacheLen : Int = 12
-    private let input : String
+    private let input : [UnicodeScalar]
     private let length : Int
     private var pos : Int = 0
     private var mark : Int = 0
@@ -23,8 +23,8 @@ public final class CharacterReader
     
     public init(_ input: String)
     {
-        self.input = input
-        self.length = self.input.unicodeScalars.count
+        self.input = Array(input.unicodeScalars)
+        self.length = self.input.count
         stringCache = Array(repeating:nil, count:512)
     }
     
@@ -37,12 +37,12 @@ public final class CharacterReader
     }
     
     public func current() -> UnicodeScalar {
-        return (pos >= length) ? CharacterReader.EOF : input.unicodeScalar(pos)
+        return (pos >= length) ? CharacterReader.EOF : input[pos]
     }
     
     @discardableResult
     public func consume() -> UnicodeScalar {
-        let val = (pos >= length) ? CharacterReader.EOF : input.unicodeScalar(pos)
+        let val = (pos >= length) ? CharacterReader.EOF : input[pos]
         pos += 1;
         return val;
     }
@@ -78,7 +78,7 @@ public final class CharacterReader
     public func nextIndexOf(_ c : UnicodeScalar) -> Int {
         // doesn't handle scanning for surrogates
         for i in pos..<length {
-            if (c == input.unicodeScalar(i)){
+            if (c == input[i]){
                 return i - pos;
             }
         }
@@ -97,16 +97,16 @@ public final class CharacterReader
         let startChar : UnicodeScalar = seq.unicodeScalar(0)
         for var offset in pos..<length {
             // scan to first instance of startchar:
-            if (startChar != input.unicodeScalar(offset)){
+            if (startChar != input[offset]){
                 offset+=1
-                while(offset < length && startChar != input.unicodeScalar(offset)) { offset+=1 }
+                while(offset < length && startChar != input[offset]) { offset+=1 }
             }
             var i = offset + 1;
             let last = i + seq.unicodeScalars.count-1;
             if (offset < length && last <= length)
             {
                 var j = 1;
-                while i < last && seq.unicodeScalar(j) == input.unicodeScalar(i) {
+                while i < last && seq.unicodeScalar(j) == input[i] {
                     j+=1
                     i+=1;
                 }
@@ -148,13 +148,24 @@ public final class CharacterReader
         let start : Int = pos;
         let remaining : Int = length;
         let val = input;
-        
-        OUTER: while (pos < remaining) {
-            for c in chars {
-                if (val.unicodeScalar(pos) == c){
-                    break OUTER;
-                }
-            }
+		if(start == 2528){
+			let d = 1
+			print(d)
+		}
+        OUTER: while (pos < remaining)
+		{
+			if(pos == 41708){
+				let d = 1
+				print(d)
+			}
+			if chars.contains(val[pos]){
+				break OUTER;
+			}
+//            for c in chars {
+//                if (val[pos] == c){
+//                    break OUTER;
+//                }
+//            }
             pos += 1;
         }
         
@@ -171,7 +182,7 @@ public final class CharacterReader
         let val = input;
         
         while (pos < remaining) {
-            if (chars.binarySearch(chars, val.unicodeScalar(pos)) >= 0){
+            if (chars.binarySearch(chars, val[pos]) >= 0){
                 break;
             }
             pos += 1;
@@ -189,7 +200,7 @@ public final class CharacterReader
         let val = input;
         
         while (pos < remaining) {
-            let c : UnicodeScalar = val.unicodeScalar(pos);
+            let c : UnicodeScalar = val[pos];
             if (c == "&" || c ==  "<" || c ==  TokeniserStateVars.nullScalr){
                 break;
             }
@@ -206,7 +217,7 @@ public final class CharacterReader
         let val = input;
         
         while (pos < remaining) {
-            let c : UnicodeScalar = val.unicodeScalar(pos)
+            let c : UnicodeScalar = val[pos]
             if (c == "\t" || c ==  "\n" || c ==  "\r" || c ==  UnicodeScalar.BackslashF || c ==  " " || c ==  "/" || c ==  ">" || c ==  TokeniserStateVars.nullScalr){
                 break;
             }
@@ -225,7 +236,7 @@ public final class CharacterReader
     public func consumeLetterSequence()-> String {
         let start = pos;
         while (pos < length) {
-            let c : UnicodeScalar = input.unicodeScalar(pos)
+            let c : UnicodeScalar = input[pos]
             if ((c >= "A" && c <= "Z") || (c >= "a" && c <= "z") || c.isMemberOfCharacterSet(CharacterSet.letters)){
                 pos += 1;
             }else{
@@ -238,7 +249,7 @@ public final class CharacterReader
     public func consumeLetterThenDigitSequence()-> String {
         let start = pos;
         while (pos < length) {
-            let c = input.unicodeScalar(pos)
+            let c = input[pos]
             if ((c >= "A" && c <= "Z") || (c >= "a" && c <= "z") || c.isMemberOfCharacterSet(CharacterSet.letters)){
                 pos += 1;
             }else{
@@ -246,7 +257,7 @@ public final class CharacterReader
             }
         }
         while (!isEmpty()) {
-            let c = input.unicodeScalar(pos)
+            let c = input[pos]
             if (c >= "0" && c <= "9"){
                 pos += 1;
             }else{
@@ -260,7 +271,7 @@ public final class CharacterReader
     public func consumeHexSequence()-> String {
         let start = pos;
         while (pos < length) {
-            let c = input.unicodeScalar(pos)
+            let c = input[pos]
             if ((c >= "0" && c <= "9") || (c >= "A" && c <= "F") || (c >= "a" && c <= "f")){
                 pos+=1;
             }else{
@@ -273,7 +284,7 @@ public final class CharacterReader
     public func consumeDigitSequence() -> String {
         let start = pos;
         while (pos < length) {
-            let c = input.unicodeScalar(pos)
+            let c = input[pos]
             if (c >= "0" && c <= "9"){
                 pos+=1;
             }else{
@@ -284,7 +295,7 @@ public final class CharacterReader
     }
     
     public func matches(_ c: UnicodeScalar) -> Bool {
-        return !isEmpty() && input.unicodeScalar(pos) == c;
+        return !isEmpty() && input[pos] == c;
         
     }
     
@@ -295,7 +306,7 @@ public final class CharacterReader
         }
         
         for offset in 0..<scanLength{
-            if (seq.unicodeScalar(offset) != input.unicodeScalar(pos+offset)){
+            if (seq.unicodeScalar(offset) != input[pos+offset]){
                 return false;
             }
         }
@@ -314,7 +325,7 @@ public final class CharacterReader
         
         for offset in 0..<scanLength{
             let upScan : UnicodeScalar = seq.unicodeScalar(offset).uppercase
-            let upTarget : UnicodeScalar = input.unicodeScalar(pos+offset).uppercase;
+            let upTarget : UnicodeScalar = input[pos+offset].uppercase;
             if (upScan != upTarget){
                 return false;
             }
@@ -327,7 +338,7 @@ public final class CharacterReader
             return false;
         }
         
-        let c : UnicodeScalar = input.unicodeScalar(pos);
+        let c : UnicodeScalar = input[pos];
         for seek in seq {
             if (seek == c){
                 return true;
@@ -337,14 +348,14 @@ public final class CharacterReader
     }
     
     public func matchesAnySorted(_ seq : [UnicodeScalar]) -> Bool {
-        return !isEmpty() && seq.binarySearch(seq, input.unicodeScalar(pos)) >= 0;
+        return !isEmpty() && seq.binarySearch(seq, input[pos]) >= 0;
     }
     
     public func matchesLetter()-> Bool {
         if (isEmpty()){
             return false;
         }
-        let c  = input.unicodeScalar(pos);
+        let c  = input[pos];
         return (c >= "A" && c <= "Z") || (c >= "a" && c <= "z") || c.isMemberOfCharacterSet(CharacterSet.letters);
     }
     
@@ -352,7 +363,7 @@ public final class CharacterReader
         if (isEmpty()){
             return false;
         }
-        let c  = input.unicodeScalar(pos)
+        let c  = input[pos]
         return (c >= "0" && c <= "9");
     }
     
@@ -385,7 +396,8 @@ public final class CharacterReader
     
     
     public func toString()->String {
-        return  input.string(pos, length - pos);
+		return String.unicodescalars(Array(input[pos..<length]))
+        //return  input.string(pos, length - pos);
     }
     
     
@@ -402,14 +414,14 @@ public final class CharacterReader
         
         // limit (no cache):
         if (count > CharacterReader.maxCacheLen){
-            return val.string(start, count);
+            return String.unicodescalars(Array(val[start..<start+count]))
         }
         
         // calculate hash:
         var hash : Int = 0;
         var offset = start;
         for _ in 0..<count{
-            let ch = val.unicodeScalar(pos).value;
+            let ch = val[offset].value;
             hash = Int.addWithOverflow(Int.multiplyWithOverflow(31, hash).0, Int(ch)).0;
             offset+=1
         }
@@ -422,13 +434,15 @@ public final class CharacterReader
         
         if (cached == nil)
         { // miss, add
-            cached = val.string(start, count);
+			cached = String.unicodescalars(Array(val[start..<start+count]))
+            //cached = val.string(start, count);
             cache[Int(index)] = cached;
         } else { // hashcode hit, check equality
             if (rangeEquals(start, count, cached!)) { // hit
                 return cached!;
             } else { // hashcode conflict
-                cached = val.string(start, count);
+				cached = String.unicodescalars(Array(val[start..<start+count]))
+                //cached = val.string(start, count);
                 cache[index] = cached; // update the cache, as recently used strings are more likely to show up again
             }
         }
@@ -447,7 +461,7 @@ public final class CharacterReader
             var j = 0;
             while (count != 0) {
                 count -= 1
-                if (one.unicodeScalar(i) != cached.unicodeScalar(j) )
+                if (one[i] != cached.unicodeScalar(j) )
                 {
                     return false;
                 }
diff --git a/Sources/String.swift b/Sources/String.swift
index 5b0c289..735bc38 100644
--- a/Sources/String.swift
+++ b/Sources/String.swift
@@ -171,6 +171,10 @@ extension String {
 		if(s == nil){return false}
         return self == s!
     }
+	
+	static func unicodescalars ( _ scalars: [UnicodeScalar]) -> String {
+		return String(scalars.flatMap { Character($0) })
+	}
     
 }
 
diff --git a/SwiftSoup.xcodeproj/project.pbxproj b/SwiftSoup.xcodeproj/project.pbxproj
index e1b81e9..e01a19c 100644
--- a/SwiftSoup.xcodeproj/project.pbxproj
+++ b/SwiftSoup.xcodeproj/project.pbxproj
@@ -108,97 +108,97 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		8C19C82E1DB7E5D200B8FC22 /* Tokeniser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Tokeniser.swift; path = ../Tokeniser.swift; sourceTree = "<group>"; };
-		8C19C8301DB7E8CD00B8FC22 /* ParseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParseError.swift; path = ../ParseError.swift; sourceTree = "<group>"; };
-		8C19C8321DB7ECB700B8FC22 /* ParseErrorList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParseErrorList.swift; path = ../ParseErrorList.swift; sourceTree = "<group>"; };
+		8C19C82E1DB7E5D200B8FC22 /* Tokeniser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tokeniser.swift; sourceTree = "<group>"; };
+		8C19C8301DB7E8CD00B8FC22 /* ParseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseError.swift; sourceTree = "<group>"; };
+		8C19C8321DB7ECB700B8FC22 /* ParseErrorList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseErrorList.swift; sourceTree = "<group>"; };
 		8C246B4E1DD71E9A00B31DA7 /* ElementsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementsTest.swift; sourceTree = "<group>"; };
-		8C246B521DD7396200B31DA7 /* OrderedSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrderedSet.swift; path = ../OrderedSet.swift; sourceTree = "<group>"; };
+		8C246B521DD7396200B31DA7 /* OrderedSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedSet.swift; sourceTree = "<group>"; };
 		8C25D5FC1DD4EA090099770C /* AttributeParseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttributeParseTest.swift; sourceTree = "<group>"; };
 		8C2FCD9F1DAA96C0006B689F /* EntitiesTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntitiesTest.swift; sourceTree = "<group>"; };
-		8C3617C01DBAC2AE00E00CFE /* Selector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Selector.swift; path = ../Selector.swift; sourceTree = "<group>"; };
+		8C3617C01DBAC2AE00E00CFE /* Selector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Selector.swift; sourceTree = "<group>"; };
 		8C41086D1DD3D97900965760 /* FormElementTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormElementTest.swift; sourceTree = "<group>"; };
 		8C5B31C71DC4090900D2F649 /* AttributesTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttributesTest.swift; sourceTree = "<group>"; };
 		8C6166431DB5738600A24CE7 /* TagTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagTest.swift; sourceTree = "<group>"; };
 		8C6166451DB573AA00A24CE7 /* NodeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodeTest.swift; sourceTree = "<group>"; };
-		8C6239C11DBE76D40024F42D /* TreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TreeBuilder.swift; path = ../TreeBuilder.swift; sourceTree = "<group>"; };
-		8C6239C31DBE90740024F42D /* HtmlTreeBuilderState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HtmlTreeBuilderState.swift; path = ../HtmlTreeBuilderState.swift; sourceTree = "<group>"; };
-		8C6239C51DBE910B0024F42D /* HtmlTreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HtmlTreeBuilder.swift; path = ../HtmlTreeBuilder.swift; sourceTree = "<group>"; };
+		8C6239C11DBE76D40024F42D /* TreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TreeBuilder.swift; sourceTree = "<group>"; };
+		8C6239C31DBE90740024F42D /* HtmlTreeBuilderState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlTreeBuilderState.swift; sourceTree = "<group>"; };
+		8C6239C51DBE910B0024F42D /* HtmlTreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlTreeBuilder.swift; sourceTree = "<group>"; };
 		8C6D1AAA1DCFB839002F4EA3 /* DocumentTypeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentTypeTest.swift; sourceTree = "<group>"; };
 		8C6D1AAC1DCFBA8F002F4EA3 /* ElementTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementTest.swift; sourceTree = "<group>"; };
-		8C73DB4A1DDA605900233A68 /* UnicodeScalar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnicodeScalar.swift; path = ../UnicodeScalar.swift; sourceTree = "<group>"; };
+		8C73DB4A1DDA605900233A68 /* UnicodeScalar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnicodeScalar.swift; sourceTree = "<group>"; };
 		8C7415941DD64E24000F6D53 /* CssTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CssTest.swift; sourceTree = "<group>"; };
 		8C776C6F1DC7B99600D389FF /* BuildEntities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuildEntities.swift; sourceTree = "<group>"; };
 		8C776C731DC7E9AA00D389FF /* DocumentTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentTest.swift; sourceTree = "<group>"; };
-		8C7D44D71DB018D500A815E0 /* TokenQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TokenQueue.swift; path = ../TokenQueue.swift; sourceTree = "<group>"; };
+		8C7D44D71DB018D500A815E0 /* TokenQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenQueue.swift; sourceTree = "<group>"; };
 		8C7D44D91DB018F100A815E0 /* TokenQueueTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenQueueTest.swift; sourceTree = "<group>"; };
 		8C7D573A1DD51C6700E7527D /* HtmlParserTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlParserTest.swift; sourceTree = "<group>"; };
-		8C80628F1DB9560C0064EC33 /* Elements.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Elements.swift; path = ../Elements.swift; sourceTree = "<group>"; };
-		8C84C43C1DB516C700D63B0D /* NodeTraversor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NodeTraversor.swift; path = ../NodeTraversor.swift; sourceTree = "<group>"; };
+		8C80628F1DB9560C0064EC33 /* Elements.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Elements.swift; sourceTree = "<group>"; };
+		8C84C43C1DB516C700D63B0D /* NodeTraversor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodeTraversor.swift; sourceTree = "<group>"; };
 		8C86B9291DE0E761009E9D85 /* entities-base.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "entities-base.properties"; sourceTree = "<group>"; };
 		8C86B92A1DE0E761009E9D85 /* entities-full.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "entities-full.properties"; sourceTree = "<group>"; };
 		8C86B92B1DE0E761009E9D85 /* entities-xhtml.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "entities-xhtml.properties"; sourceTree = "<group>"; };
-		8C89785B1DBCBC5600B1C024 /* StructuralEvaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StructuralEvaluator.swift; path = ../StructuralEvaluator.swift; sourceTree = "<group>"; };
-		8C89785D1DBCDB0D00B1C024 /* CombiningEvaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CombiningEvaluator.swift; path = ../CombiningEvaluator.swift; sourceTree = "<group>"; };
-		8C9380111DC6945B0014DAD6 /* SimpleDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SimpleDictionary.swift; path = ../SimpleDictionary.swift; sourceTree = "<group>"; };
-		8C9651A71DBC16D800FCB4C2 /* Comment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Comment.swift; path = ../Comment.swift; sourceTree = "<group>"; };
-		8C9651A91DBC2B6B00FCB4C2 /* QueryParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = QueryParser.swift; path = ../QueryParser.swift; sourceTree = "<group>"; };
+		8C89785B1DBCBC5600B1C024 /* StructuralEvaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StructuralEvaluator.swift; sourceTree = "<group>"; };
+		8C89785D1DBCDB0D00B1C024 /* CombiningEvaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombiningEvaluator.swift; sourceTree = "<group>"; };
+		8C9380111DC6945B0014DAD6 /* SimpleDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleDictionary.swift; sourceTree = "<group>"; };
+		8C9651A71DBC16D800FCB4C2 /* Comment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Comment.swift; sourceTree = "<group>"; };
+		8C9651A91DBC2B6B00FCB4C2 /* QueryParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryParser.swift; sourceTree = "<group>"; };
 		8C9853C71DCBD4C000A05A8C /*  */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = ""; sourceTree = "<group>"; };
-		8CA209861DB3A38E00A9EC9D /* NodeVisitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NodeVisitor.swift; path = ../NodeVisitor.swift; sourceTree = "<group>"; };
-		8CA859601DB69481006B8148 /* Token.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Token.swift; path = ../Token.swift; sourceTree = "<group>"; };
+		8CA209861DB3A38E00A9EC9D /* NodeVisitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodeVisitor.swift; sourceTree = "<group>"; };
+		8CA859601DB69481006B8148 /* Token.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Token.swift; sourceTree = "<group>"; };
 		8CB5D3601DFF2E5B006B31C8 /*  */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = ""; sourceTree = "<group>"; };
 		8CB5D3641DFF343A006B31C8 /* SwiftSoupTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftSoupTests.swift; sourceTree = "<group>"; };
 		8CB5D3651DFF343A006B31C8 /* TextUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextUtil.swift; sourceTree = "<group>"; };
-		8CC2FD801DB1176A002CB469 /* XmlTreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XmlTreeBuilder.swift; path = ../XmlTreeBuilder.swift; sourceTree = "<group>"; };
+		8CC2FD801DB1176A002CB469 /* XmlTreeBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XmlTreeBuilder.swift; sourceTree = "<group>"; };
 		8CC2FD821DB11788002CB469 /* XmlTreeBuilderTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XmlTreeBuilderTest.swift; sourceTree = "<group>"; };
-		8CC2FD841DB11B64002CB469 /* ParseSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParseSettings.swift; path = ../ParseSettings.swift; sourceTree = "<group>"; };
+		8CC2FD841DB11B64002CB469 /* ParseSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseSettings.swift; sourceTree = "<group>"; };
 		8CC2FD861DB11B7E002CB469 /* ParseSettingsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseSettingsTest.swift; sourceTree = "<group>"; };
-		8CC2FD8C1DB12382002CB469 /* Whitelist.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Whitelist.swift; path = ../Whitelist.swift; sourceTree = "<group>"; };
+		8CC2FD8C1DB12382002CB469 /* Whitelist.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Whitelist.swift; sourceTree = "<group>"; };
 		8CC71B1A1DD74662007251C6 /* QueryParserTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryParserTest.swift; sourceTree = "<group>"; };
 		8CC71B1C1DD754AD007251C6 /* SelectorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectorTest.swift; sourceTree = "<group>"; };
 		8CC7496B1DD3DDB200298117 /* TextNodeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextNodeTest.swift; sourceTree = "<group>"; };
-		8CD48F1E1DBB6B5100D1D88F /* Collector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Collector.swift; path = ../Collector.swift; sourceTree = "<group>"; };
-		8CD48F201DBB6D2F00D1D88F /* Evaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Evaluator.swift; path = ../Evaluator.swift; sourceTree = "<group>"; };
+		8CD48F1E1DBB6B5100D1D88F /* Collector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collector.swift; sourceTree = "<group>"; };
+		8CD48F201DBB6D2F00D1D88F /* Evaluator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Evaluator.swift; sourceTree = "<group>"; };
 		8CD500DB1DAE653D002270FC /* CharacterReaderTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterReaderTest.swift; sourceTree = "<group>"; };
-		8CD500DD1DAEC9FF002270FC /* TokeniserState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TokeniserState.swift; path = ../TokeniserState.swift; sourceTree = "<group>"; };
-		8CE2D93E1DB2796C00C7BDE3 /* Cleaner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Cleaner.swift; path = ../Cleaner.swift; sourceTree = "<group>"; };
-		8CE2D9401DB27CAD00C7BDE3 /* Tag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Tag.swift; path = ../Tag.swift; sourceTree = "<group>"; };
+		8CD500DD1DAEC9FF002270FC /* TokeniserState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokeniserState.swift; sourceTree = "<group>"; };
+		8CE2D93E1DB2796C00C7BDE3 /* Cleaner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cleaner.swift; sourceTree = "<group>"; };
+		8CE2D9401DB27CAD00C7BDE3 /* Tag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		8CE418161DAA54A900240B42 /* SwiftSoup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSoup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8CE418191DAA54A900240B42 /* SwiftSoup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftSoup.h; sourceTree = "<group>"; };
 		8CE4181A1DAA54A900240B42 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8CE4181F1DAA54A900240B42 /* SwiftSoupTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftSoupTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8CE418261DAA54A900240B42 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8CE418301DAA568600240B42 /* Connection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Connection.swift; sourceTree = "<group>"; };
-		8CE418321DAA568600240B42 /* DataUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DataUtil.swift; path = ../DataUtil.swift; sourceTree = "<group>"; };
-		8CE418331DAA568600240B42 /* Exception.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Exception.swift; path = ../Exception.swift; sourceTree = "<group>"; };
-		8CE418351DAA568600240B42 /* StringBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringBuilder.swift; path = ../StringBuilder.swift; sourceTree = "<group>"; };
-		8CE418371DAA568600240B42 /* StringUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringUtil.swift; path = ../StringUtil.swift; sourceTree = "<group>"; };
-		8CE418381DAA568600240B42 /* Validate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Validate.swift; path = ../Validate.swift; sourceTree = "<group>"; };
+		8CE418321DAA568600240B42 /* DataUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataUtil.swift; sourceTree = "<group>"; };
+		8CE418331DAA568600240B42 /* Exception.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Exception.swift; sourceTree = "<group>"; };
+		8CE418351DAA568600240B42 /* StringBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringBuilder.swift; sourceTree = "<group>"; };
+		8CE418371DAA568600240B42 /* StringUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringUtil.swift; sourceTree = "<group>"; };
+		8CE418381DAA568600240B42 /* Validate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Validate.swift; sourceTree = "<group>"; };
 		8CE418391DAA568600240B42 /* HttpStatusException.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpStatusException.swift; sourceTree = "<group>"; };
-		8CE4183B1DAA568600240B42 /* Attribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Attribute.swift; path = ../Attribute.swift; sourceTree = "<group>"; };
-		8CE4183C1DAA568600240B42 /* Attributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Attributes.swift; path = ../Attributes.swift; sourceTree = "<group>"; };
-		8CE4183D1DAA568600240B42 /* BooleanAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BooleanAttribute.swift; path = ../BooleanAttribute.swift; sourceTree = "<group>"; };
-		8CE4183E1DAA568600240B42 /* DataNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DataNode.swift; path = ../DataNode.swift; sourceTree = "<group>"; };
-		8CE4183F1DAA568600240B42 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Document.swift; path = ../Document.swift; sourceTree = "<group>"; };
-		8CE418401DAA568600240B42 /* DocumentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DocumentType.swift; path = ../DocumentType.swift; sourceTree = "<group>"; };
-		8CE418411DAA568600240B42 /* Element.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Element.swift; path = ../Element.swift; sourceTree = "<group>"; };
-		8CE418451DAA568600240B42 /* Entities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Entities.swift; path = ../Entities.swift; sourceTree = "<group>"; };
-		8CE418461DAA568600240B42 /* FormElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FormElement.swift; path = ../FormElement.swift; sourceTree = "<group>"; };
-		8CE418471DAA568600240B42 /* Node.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Node.swift; path = ../Node.swift; sourceTree = "<group>"; };
-		8CE418481DAA568600240B42 /* TextNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TextNode.swift; path = ../TextNode.swift; sourceTree = "<group>"; };
-		8CE418491DAA568600240B42 /* XmlDeclaration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XmlDeclaration.swift; path = ../XmlDeclaration.swift; sourceTree = "<group>"; };
-		8CE4184B1DAA568600240B42 /* Parser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Parser.swift; path = ../Parser.swift; sourceTree = "<group>"; };
+		8CE4183B1DAA568600240B42 /* Attribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Attribute.swift; sourceTree = "<group>"; };
+		8CE4183C1DAA568600240B42 /* Attributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Attributes.swift; sourceTree = "<group>"; };
+		8CE4183D1DAA568600240B42 /* BooleanAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BooleanAttribute.swift; sourceTree = "<group>"; };
+		8CE4183E1DAA568600240B42 /* DataNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataNode.swift; sourceTree = "<group>"; };
+		8CE4183F1DAA568600240B42 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; };
+		8CE418401DAA568600240B42 /* DocumentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentType.swift; sourceTree = "<group>"; };
+		8CE418411DAA568600240B42 /* Element.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Element.swift; sourceTree = "<group>"; };
+		8CE418451DAA568600240B42 /* Entities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Entities.swift; sourceTree = "<group>"; };
+		8CE418461DAA568600240B42 /* FormElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormElement.swift; sourceTree = "<group>"; };
+		8CE418471DAA568600240B42 /* Node.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Node.swift; sourceTree = "<group>"; };
+		8CE418481DAA568600240B42 /* TextNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextNode.swift; sourceTree = "<group>"; };
+		8CE418491DAA568600240B42 /* XmlDeclaration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XmlDeclaration.swift; sourceTree = "<group>"; };
+		8CE4184B1DAA568600240B42 /* Parser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
 		8CE4184E1DAA568600240B42 /* SerializationException.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerializationException.swift; sourceTree = "<group>"; };
-		8CE418501DAA568600240B42 /* ArrayExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExt.swift; path = ../ArrayExt.swift; sourceTree = "<group>"; };
-		8CE418511DAA568600240B42 /* CharacterExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CharacterExt.swift; path = ../CharacterExt.swift; sourceTree = "<group>"; };
-		8CE418521DAA568600240B42 /* IntExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IntExt.swift; path = ../IntExt.swift; sourceTree = "<group>"; };
-		8CE418531DAA568600240B42 /* OrderedDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrderedDictionary.swift; path = ../OrderedDictionary.swift; sourceTree = "<group>"; };
-		8CE418541DAA568600240B42 /* Pattern.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Pattern.swift; path = ../Pattern.swift; sourceTree = "<group>"; };
-		8CE418551DAA568600240B42 /* StreamReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StreamReader.swift; path = ../StreamReader.swift; sourceTree = "<group>"; };
+		8CE418501DAA568600240B42 /* ArrayExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayExt.swift; sourceTree = "<group>"; };
+		8CE418511DAA568600240B42 /* CharacterExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterExt.swift; sourceTree = "<group>"; };
+		8CE418521DAA568600240B42 /* IntExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntExt.swift; sourceTree = "<group>"; };
+		8CE418531DAA568600240B42 /* OrderedDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedDictionary.swift; sourceTree = "<group>"; };
+		8CE418541DAA568600240B42 /* Pattern.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pattern.swift; sourceTree = "<group>"; };
+		8CE418551DAA568600240B42 /* StreamReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StreamReader.swift; sourceTree = "<group>"; };
 		8CE418571DAA568600240B42 /* SwiftSoup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftSoup.swift; sourceTree = "<group>"; };
 		8CE4187D1DAA572100240B42 /* AttributeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttributeTest.swift; sourceTree = "<group>"; };
 		8CE418801DAA576E00240B42 /* StringUtilTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringUtilTest.swift; sourceTree = "<group>"; };
-		8CEA29581DAC112B0064A341 /* CharacterReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CharacterReader.swift; path = ../CharacterReader.swift; sourceTree = "<group>"; };
-		8CEA295A1DAC23820064A341 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = String.swift; path = ../String.swift; sourceTree = "<group>"; };
+		8CEA29581DAC112B0064A341 /* CharacterReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterReader.swift; sourceTree = "<group>"; };
+		8CEA295A1DAC23820064A341 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -232,6 +232,101 @@
 			path = selectTests;
 			sourceTree = "<group>";
 		};
+		8C7ED6731E00B0690032A27C /* shared */ = {
+			isa = PBXGroup;
+			children = (
+				8CE418501DAA568600240B42 /* ArrayExt.swift */,
+				8CE418511DAA568600240B42 /* CharacterExt.swift */,
+				8CE418521DAA568600240B42 /* IntExt.swift */,
+				8CE418531DAA568600240B42 /* OrderedDictionary.swift */,
+				8CE418541DAA568600240B42 /* Pattern.swift */,
+				8CE418551DAA568600240B42 /* StreamReader.swift */,
+				8CEA295A1DAC23820064A341 /* String.swift */,
+				8C9380111DC6945B0014DAD6 /* SimpleDictionary.swift */,
+				8C246B521DD7396200B31DA7 /* OrderedSet.swift */,
+				8C73DB4A1DDA605900233A68 /* UnicodeScalar.swift */,
+			);
+			name = shared;
+			sourceTree = "<group>";
+		};
+		8C7ED6741E00B10F0032A27C /* helper */ = {
+			isa = PBXGroup;
+			children = (
+				8CE418321DAA568600240B42 /* DataUtil.swift */,
+				8CE418331DAA568600240B42 /* Exception.swift */,
+				8CE418351DAA568600240B42 /* StringBuilder.swift */,
+				8CE418371DAA568600240B42 /* StringUtil.swift */,
+				8CE418381DAA568600240B42 /* Validate.swift */,
+			);
+			name = helper;
+			sourceTree = "<group>";
+		};
+		8C7ED6751E00B1280032A27C /* nodes */ = {
+			isa = PBXGroup;
+			children = (
+				8CE4183B1DAA568600240B42 /* Attribute.swift */,
+				8CE4183C1DAA568600240B42 /* Attributes.swift */,
+				8CE4183D1DAA568600240B42 /* BooleanAttribute.swift */,
+				8C9651A71DBC16D800FCB4C2 /* Comment.swift */,
+				8CE4183E1DAA568600240B42 /* DataNode.swift */,
+				8CE4183F1DAA568600240B42 /* Document.swift */,
+				8CE418401DAA568600240B42 /* DocumentType.swift */,
+				8CE418411DAA568600240B42 /* Element.swift */,
+				8CE418451DAA568600240B42 /* Entities.swift */,
+				8CE418461DAA568600240B42 /* FormElement.swift */,
+				8CE418471DAA568600240B42 /* Node.swift */,
+				8CE418481DAA568600240B42 /* TextNode.swift */,
+				8CE418491DAA568600240B42 /* XmlDeclaration.swift */,
+			);
+			name = nodes;
+			sourceTree = "<group>";
+		};
+		8C7ED6761E00B13E0032A27C /* parser */ = {
+			isa = PBXGroup;
+			children = (
+				8CEA29581DAC112B0064A341 /* CharacterReader.swift */,
+				8C6239C51DBE910B0024F42D /* HtmlTreeBuilder.swift */,
+				8C6239C31DBE90740024F42D /* HtmlTreeBuilderState.swift */,
+				8C19C8301DB7E8CD00B8FC22 /* ParseError.swift */,
+				8C19C8321DB7ECB700B8FC22 /* ParseErrorList.swift */,
+				8CE4184B1DAA568600240B42 /* Parser.swift */,
+				8CC2FD841DB11B64002CB469 /* ParseSettings.swift */,
+				8CE2D9401DB27CAD00C7BDE3 /* Tag.swift */,
+				8CA859601DB69481006B8148 /* Token.swift */,
+				8C19C82E1DB7E5D200B8FC22 /* Tokeniser.swift */,
+				8CD500DD1DAEC9FF002270FC /* TokeniserState.swift */,
+				8C7D44D71DB018D500A815E0 /* TokenQueue.swift */,
+				8C6239C11DBE76D40024F42D /* TreeBuilder.swift */,
+				8CC2FD801DB1176A002CB469 /* XmlTreeBuilder.swift */,
+			);
+			name = parser;
+			sourceTree = "<group>";
+		};
+		8C7ED6771E00B1570032A27C /* safety */ = {
+			isa = PBXGroup;
+			children = (
+				8CC2FD8C1DB12382002CB469 /* Whitelist.swift */,
+				8CE2D93E1DB2796C00C7BDE3 /* Cleaner.swift */,
+			);
+			name = safety;
+			sourceTree = "<group>";
+		};
+		8C7ED6781E00B16C0032A27C /* select */ = {
+			isa = PBXGroup;
+			children = (
+				8CD48F1E1DBB6B5100D1D88F /* Collector.swift */,
+				8C89785D1DBCDB0D00B1C024 /* CombiningEvaluator.swift */,
+				8C80628F1DB9560C0064EC33 /* Elements.swift */,
+				8CD48F201DBB6D2F00D1D88F /* Evaluator.swift */,
+				8C84C43C1DB516C700D63B0D /* NodeTraversor.swift */,
+				8CA209861DB3A38E00A9EC9D /* NodeVisitor.swift */,
+				8C9651A91DBC2B6B00FCB4C2 /* QueryParser.swift */,
+				8C3617C01DBAC2AE00E00CFE /* Selector.swift */,
+				8C89785B1DBCBC5600B1C024 /* StructuralEvaluator.swift */,
+			);
+			name = select;
+			sourceTree = "<group>";
+		};
 		8C86B9281DE0E761009E9D85 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
@@ -288,14 +383,14 @@
 		8CE418181DAA54A900240B42 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				8CE4184F1DAA568600240B42 /* shared */,
+				8C7ED6741E00B10F0032A27C /* helper */,
+				8C7ED6731E00B0690032A27C /* shared */,
 				8CE418301DAA568600240B42 /* Connection.swift */,
-				8CE418311DAA568600240B42 /* helper */,
 				8CE418391DAA568600240B42 /* HttpStatusException.swift */,
-				8CE4183A1DAA568600240B42 /* nodes */,
-				8CE4184A1DAA568600240B42 /* parser */,
-				8CE4184C1DAA568600240B42 /* safety */,
-				8CE4184D1DAA568600240B42 /* select */,
+				8C7ED6781E00B16C0032A27C /* select */,
+				8C7ED6771E00B1570032A27C /* safety */,
+				8C7ED6761E00B13E0032A27C /* parser */,
+				8C7ED6751E00B1280032A27C /* nodes */,
 				8CE4184E1DAA568600240B42 /* SerializationException.swift */,
 				8CE418571DAA568600240B42 /* SwiftSoup.swift */,
 				8CE418191DAA54A900240B42 /* SwiftSoup.h */,
@@ -319,101 +414,6 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		8CE418311DAA568600240B42 /* helper */ = {
-			isa = PBXGroup;
-			children = (
-				8CE418321DAA568600240B42 /* DataUtil.swift */,
-				8CE418331DAA568600240B42 /* Exception.swift */,
-				8CE418351DAA568600240B42 /* StringBuilder.swift */,
-				8CE418371DAA568600240B42 /* StringUtil.swift */,
-				8CE418381DAA568600240B42 /* Validate.swift */,
-			);
-			path = helper;
-			sourceTree = "<group>";
-		};
-		8CE4183A1DAA568600240B42 /* nodes */ = {
-			isa = PBXGroup;
-			children = (
-				8CE4183B1DAA568600240B42 /* Attribute.swift */,
-				8CE4183C1DAA568600240B42 /* Attributes.swift */,
-				8CE4183D1DAA568600240B42 /* BooleanAttribute.swift */,
-				8C9651A71DBC16D800FCB4C2 /* Comment.swift */,
-				8CE4183E1DAA568600240B42 /* DataNode.swift */,
-				8CE4183F1DAA568600240B42 /* Document.swift */,
-				8CE418401DAA568600240B42 /* DocumentType.swift */,
-				8CE418411DAA568600240B42 /* Element.swift */,
-				8CE418451DAA568600240B42 /* Entities.swift */,
-				8CE418461DAA568600240B42 /* FormElement.swift */,
-				8CE418471DAA568600240B42 /* Node.swift */,
-				8CE418481DAA568600240B42 /* TextNode.swift */,
-				8CE418491DAA568600240B42 /* XmlDeclaration.swift */,
-			);
-			path = nodes;
-			sourceTree = "<group>";
-		};
-		8CE4184A1DAA568600240B42 /* parser */ = {
-			isa = PBXGroup;
-			children = (
-				8CEA29581DAC112B0064A341 /* CharacterReader.swift */,
-				8C6239C51DBE910B0024F42D /* HtmlTreeBuilder.swift */,
-				8C6239C31DBE90740024F42D /* HtmlTreeBuilderState.swift */,
-				8C19C8301DB7E8CD00B8FC22 /* ParseError.swift */,
-				8C19C8321DB7ECB700B8FC22 /* ParseErrorList.swift */,
-				8CE4184B1DAA568600240B42 /* Parser.swift */,
-				8CC2FD841DB11B64002CB469 /* ParseSettings.swift */,
-				8CE2D9401DB27CAD00C7BDE3 /* Tag.swift */,
-				8CA859601DB69481006B8148 /* Token.swift */,
-				8C19C82E1DB7E5D200B8FC22 /* Tokeniser.swift */,
-				8CD500DD1DAEC9FF002270FC /* TokeniserState.swift */,
-				8C7D44D71DB018D500A815E0 /* TokenQueue.swift */,
-				8C6239C11DBE76D40024F42D /* TreeBuilder.swift */,
-				8CC2FD801DB1176A002CB469 /* XmlTreeBuilder.swift */,
-			);
-			path = parser;
-			sourceTree = "<group>";
-		};
-		8CE4184C1DAA568600240B42 /* safety */ = {
-			isa = PBXGroup;
-			children = (
-				8CC2FD8C1DB12382002CB469 /* Whitelist.swift */,
-				8CE2D93E1DB2796C00C7BDE3 /* Cleaner.swift */,
-			);
-			path = safety;
-			sourceTree = "<group>";
-		};
-		8CE4184D1DAA568600240B42 /* select */ = {
-			isa = PBXGroup;
-			children = (
-				8CD48F1E1DBB6B5100D1D88F /* Collector.swift */,
-				8C89785D1DBCDB0D00B1C024 /* CombiningEvaluator.swift */,
-				8C80628F1DB9560C0064EC33 /* Elements.swift */,
-				8CD48F201DBB6D2F00D1D88F /* Evaluator.swift */,
-				8C84C43C1DB516C700D63B0D /* NodeTraversor.swift */,
-				8CA209861DB3A38E00A9EC9D /* NodeVisitor.swift */,
-				8C9651A91DBC2B6B00FCB4C2 /* QueryParser.swift */,
-				8C3617C01DBAC2AE00E00CFE /* Selector.swift */,
-				8C89785B1DBCBC5600B1C024 /* StructuralEvaluator.swift */,
-			);
-			path = select;
-			sourceTree = "<group>";
-		};
-		8CE4184F1DAA568600240B42 /* shared */ = {
-			isa = PBXGroup;
-			children = (
-				8CE418501DAA568600240B42 /* ArrayExt.swift */,
-				8CE418511DAA568600240B42 /* CharacterExt.swift */,
-				8CE418521DAA568600240B42 /* IntExt.swift */,
-				8CE418531DAA568600240B42 /* OrderedDictionary.swift */,
-				8CE418541DAA568600240B42 /* Pattern.swift */,
-				8CE418551DAA568600240B42 /* StreamReader.swift */,
-				8CEA295A1DAC23820064A341 /* String.swift */,
-				8C9380111DC6945B0014DAD6 /* SimpleDictionary.swift */,
-				8C246B521DD7396200B31DA7 /* OrderedSet.swift */,
-				8C73DB4A1DDA605900233A68 /* UnicodeScalar.swift */,
-			);
-			path = shared;
-			sourceTree = "<group>";
-		};
 		8CE4187C1DAA571700240B42 /* nodes */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/Tests/helperTests/StringUtilTest.swift b/Tests/helperTests/StringUtilTest.swift
index 7802553..207c717 100644
--- a/Tests/helperTests/StringUtilTest.swift
+++ b/Tests/helperTests/StringUtilTest.swift
@@ -9,7 +9,7 @@
 import XCTest
 import SwiftSoup
 
-class SwifSoupTests: XCTestCase {
+class StringUtilTest: XCTestCase {
     
     override func setUp() {
         super.setUp()
@@ -21,7 +21,26 @@ class SwifSoupTests: XCTestCase {
         super.tearDown()
     }
     
-    
+	func testSite()
+	{
+		let myURLString = "http://comcast.net"
+		guard let myURL = URL(string: myURLString) else {
+			print("Error: \(myURLString) doesn't seem to be a valid URL")
+			return
+		}
+		
+		
+		do {
+			let html = try String(contentsOf: myURL, encoding: .utf8)
+			print("HTML : \(html)")
+			let doc: Document = try SwiftSoup.parse(html)
+			print(try doc.text())
+		}
+		catch {
+			print("Error")
+		}
+	}
+	
     func testJoin() {
         XCTAssertEqual("",StringUtil.join([""], sep: " "));
         XCTAssertEqual("one",StringUtil.join(["one"], sep: " "));
diff --git a/Tests/textTests/SwiftSoupTests.swift b/Tests/textTests/SwiftSoupTests.swift
index 3d7eae8..5ee7da1 100644
--- a/Tests/textTests/SwiftSoupTests.swift
+++ b/Tests/textTests/SwiftSoupTests.swift
@@ -14,21 +14,21 @@ class SwiftSoupTests: XCTestCase {
     override func setUp() {
         super.setUp()
         
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-        
-        // In UI tests it is usually best to stop immediately when a failure occurs.
-        continueAfterFailure = false
-        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
-        XCUIApplication().launch()
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+//        // Put setup code here. This method is called before the invocation of each test method in the class.
+//        
+//        // In UI tests it is usually best to stop immediately when a failure occurs.
+//        continueAfterFailure = false
+//        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
+//        XCUIApplication().launch()
+//
+//        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
     }
     
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
-
+	
+	
     
 }

From 6deea2f271c48ea2d46245a3db4fb4e2ad5bb924 Mon Sep 17 00:00:00 2001
From: Nabil Chatbi <scinfu@gmail.com>
Date: Wed, 14 Dec 2016 12:43:21 +0100
Subject: [PATCH 2/2] bump version

---
 SwiftSoup.podspec                      |  2 +-
 Tests/helperTests/StringUtilTest.swift | 38 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/SwiftSoup.podspec b/SwiftSoup.podspec
index 2c6e1a7..e51a4d0 100644
--- a/SwiftSoup.podspec
+++ b/SwiftSoup.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftSoup'
-  s.version          = '1.0.0'
+  s.version          = '1.0.1'
   s.summary          = 'Swift HTML Parser.'
 
 # This description is used to generate tags and improve search results.
diff --git a/Tests/helperTests/StringUtilTest.swift b/Tests/helperTests/StringUtilTest.swift
index 207c717..e801f37 100644
--- a/Tests/helperTests/StringUtilTest.swift
+++ b/Tests/helperTests/StringUtilTest.swift
@@ -21,25 +21,25 @@ class StringUtilTest: XCTestCase {
         super.tearDown()
     }
     
-	func testSite()
-	{
-		let myURLString = "http://comcast.net"
-		guard let myURL = URL(string: myURLString) else {
-			print("Error: \(myURLString) doesn't seem to be a valid URL")
-			return
-		}
-		
-		
-		do {
-			let html = try String(contentsOf: myURL, encoding: .utf8)
-			print("HTML : \(html)")
-			let doc: Document = try SwiftSoup.parse(html)
-			print(try doc.text())
-		}
-		catch {
-			print("Error")
-		}
-	}
+//	func testSite()
+//	{
+//		let myURLString = "http://comcast.net"
+//		guard let myURL = URL(string: myURLString) else {
+//			print("Error: \(myURLString) doesn't seem to be a valid URL")
+//			return
+//		}
+//		
+//		
+//		do {
+//			let html = try String(contentsOf: myURL, encoding: .utf8)
+//			print("HTML : \(html)")
+//			let doc: Document = try SwiftSoup.parse(html)
+//			print(try doc.text())
+//		}
+//		catch {
+//			print("Error")
+//		}
+//	}
 	
     func testJoin() {
         XCTAssertEqual("",StringUtil.join([""], sep: " "));