fix NSJSONSerialization for SE-0110

dduan · dduan · commit 57165ea8a493 · 2016-07-31T12:30:02.000-07:00
diff --git a/Foundation/NSJSONSerialization.swift b/Foundation/NSJSONSerialization.swift
@@ -667,7 +667,7 @@ private struct JSONReader {
         
         if source.encoding == String.Encoding.utf8 {
             
-            return parseTypedNumber(source.buffer.baseAddress!.advanced(by: input), count: source.buffer.count - input).map { return ($0.0, input + $0.1) }
+            return parseTypedNumber(source.buffer.baseAddress!.advanced(by: input), count: source.buffer.count - input).map { return ($0, input + $1) }
         }
         else {
             var numberCharacters = [UInt8]()
@@ -681,7 +681,7 @@ private struct JSONReader {
             
             return numberCharacters.withUnsafeBufferPointer {
                 parseTypedNumber($0.baseAddress!, count: $0.count)
-            }.map { return ($0.0, index) }
+            }.map { any, _ in return (any, index) }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ private struct JSONReader {`
`667`	`667`
`668`	`668`	`if source.encoding == String.Encoding.utf8 {`
`669`	`669`
`670`		`- return parseTypedNumber(source.buffer.baseAddress!.advanced(by: input), count: source.buffer.count - input).map { return ($0.0, input + $0.1) }`
	`670`	`+ return parseTypedNumber(source.buffer.baseAddress!.advanced(by: input), count: source.buffer.count - input).map { return ($0, input + $1) }`
`671`	`671`	`}`
`672`	`672`	`else {`
`673`	`673`	`var numberCharacters = [UInt8]()`
`@@ -681,7 +681,7 @@ private struct JSONReader {`
`681`	`681`
`682`	`682`	`return numberCharacters.withUnsafeBufferPointer {`
`683`	`683`	`parseTypedNumber($0.baseAddress!, count: $0.count)`
`684`		`- }.map { return ($0.0, index) }`
	`684`	`+ }.map { any, _ in return (any, index) }`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`