@@ -217,20 +217,16 @@ class SocketParser {
217
217
return
218
218
}
219
219
220
-
221
220
/**
222
221
Begin check for message
223
222
**/
224
- let messageGroups = stringMessage [ " ( \\ d*) \\ /?( \\ w*)?,?( \\ d*)? \\ [ \" (.*?) \" ,?(.*?)? \\ ]$ " ] . groups ( )
223
+ let messageGroups = stringMessage [ " ( \\ d*) \\ /?( \\ w*)?,?( \\ d*)? \\ [ \" (.*?) \" ,?(.*?)? \\ ]$ " ,
224
+ NSRegularExpressionOptions . DotMatchesLineSeparators] . groups ( )
225
225
if messageGroups == nil {
226
226
NSLog ( " Error in groups " )
227
227
return
228
228
}
229
229
230
- // let messageGroups = SwiftRegex(target: stringMessage as NSString,
231
- // pattern: "(\\d*)\\/?(\\w*)?,?(\\d*)?\\[\"(.*?)\",?(.*?)?\\]$",
232
- // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups()
233
-
234
230
if messageGroups![ 1 ] . hasPrefix ( " 2 " ) {
235
231
var mesNum = messageGroups![ 1 ]
236
232
var ackNum : String
@@ -343,10 +339,8 @@ class SocketParser {
343
339
/**
344
340
Begin check for binary placeholders
345
341
**/
346
- let binaryGroup = message [ " ^( \\ d*)- \\ /?( \\ w*)?,?( \\ d*)? \\ [( \" .*? \" )?,?(.*)? \\ ]$ " ] . groups ( )
347
- // let binaryGroup = SwiftRegex(target: message,
348
- // pattern: "^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$",
349
- // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups()
342
+ let binaryGroup = message [ " ^( \\ d*)- \\ /?( \\ w*)?,?( \\ d*)? \\ [( \" .*? \" )?,?(.*)? \\ ]$ " ,
343
+ NSRegularExpressionOptions . DotMatchesLineSeparators] . groups ( )
350
344
351
345
if binaryGroup == nil {
352
346
return
@@ -359,6 +353,7 @@ class SocketParser {
359
353
var mutMessageObject : String
360
354
var namespace : String ?
361
355
var numberOfPlaceholders : String
356
+
362
357
let messageType = binaryGroup![ 1 ]
363
358
364
359
namespace = binaryGroup![ 2 ]
@@ -422,4 +417,4 @@ class SocketParser {
422
417
End check for binary placeholders
423
418
**/
424
419
}
425
- }
420
+ }
0 commit comments