From a6f68e7b70cb30781862a1b369d9d73053ebdaab Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Sun, 17 May 2015 08:28:10 -0400
Subject: [PATCH] tweaks

---
 SocketIOClientSwift/SocketEngine.swift       | 4 ++--
 SocketIOClientSwift/SocketEngineClient.swift | 1 -
 SocketIOClientSwift/SocketEventHandler.swift | 1 -
 SocketIOClientSwift/SocketParser.swift       | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index caec186..93dd879 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -430,7 +430,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
             }
         }
         
-        for var i = 0, l = str.length; i < l; i = i &+ 1 {
+        for var i = 0, l = str.length; i < l; i++ {
             let chr = String(strArray[i])
             
             if chr != ":" {
@@ -443,7 +443,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
                     return
                 }
                 
-                msg = String(strArray[i&+1...i&+n])
+                msg = String(strArray[i+1...i+n])
                 
                 if let lengthInt = length.toInt() {
                     if lengthInt != msg.length {
diff --git a/SocketIOClientSwift/SocketEngineClient.swift b/SocketIOClientSwift/SocketEngineClient.swift
index 7312606..27040fb 100644
--- a/SocketIOClientSwift/SocketEngineClient.swift
+++ b/SocketIOClientSwift/SocketEngineClient.swift
@@ -27,7 +27,6 @@ import Foundation
 
 @objc public protocol SocketEngineClient {
     var handleQueue:dispatch_queue_attr_t! {get}
-    var emitQueue:dispatch_queue_attr_t! {get}
     var socketURL:String {get}
     var secure:Bool {get}
     
diff --git a/SocketIOClientSwift/SocketEventHandler.swift b/SocketIOClientSwift/SocketEventHandler.swift
index 5a6777b..cef0d4d 100644
--- a/SocketIOClientSwift/SocketEventHandler.swift
+++ b/SocketIOClientSwift/SocketEventHandler.swift
@@ -25,7 +25,6 @@
 import Foundation
 
 private func emitAckCallback(socket:SocketIOClient, num:Int)
-    // Curried
     (items:AnyObject...) -> Void {
         socket.emitAck(num, withData: items)
 }
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index 35c488e..745636f 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -145,7 +145,7 @@ class SocketParser {
         }
         
         if ++i < arr.count {
-            let d = String(arr[i...arr.count-1])
+            let d = str[advance(str.startIndex, i)...advance(str.startIndex, count(str)-1)]
             let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
             let data = SocketParser.parseData(noPlaceholders) as? [AnyObject] ?? [noPlaceholders]