Implementing jsonObject with streams api of NSJSONSerialization.

Author: mamabusi

Foundation/NSJSONSerialization.swift

@@ -126,8 +126,8 @@ public class JSONSerialization : NSObject {
        The data must be in one of the 5 supported encodings listed in the JSON specification: UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE. The data may or may not have a BOM. The most efficient encoding to use for parsing is UTF-8, so if you have a choice in encoding the data passed to this method, use UTF-8.
      */
     /// - Experiment: Note that the return type of this function is different than on Darwin Foundation (Any instead of AnyObject). This is likely to change once we have a more complete story for bridging in place.
-    public class func jsonObject(with data: Data, options opt: ReadingOptions = []) throws -> Any {
-        return try data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) -> Any in
+    public class func jsonObject(with data: Data, options opt: ReadingOptions = []) throws -> AnyObject {
+        return try data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) -> AnyObject in
             let encoding: String.Encoding
             let buffer: UnsafeBufferPointer<UInt8>
             if let detected = parseBOM(bytes, length: data.count) {
@@ -142,10 +142,10 @@ public class JSONSerialization : NSObject {
             let source = JSONReader.UnicodeSource(buffer: buffer, encoding: encoding)
             let reader = JSONReader(source: source)
             if let (object, _) = try reader.parseObject(0) {
-                return object
+                return object.bridge()
             }
             else if let (array, _) = try reader.parseArray(0) {
-                return array
+                return array.bridge()
             }
             else if opt.contains(.allowFragments), let (value, _) = try reader.parseValue(0) {
                 return value
@@ -169,7 +169,19 @@ public class JSONSerialization : NSObject {
     /* Create a JSON object from JSON data stream. The stream should be opened and configured. All other behavior of this method is the same as the JSONObjectWithData:options:error: method.
      */
     public class func jsonObject(with stream: InputStream, options opt: ReadingOptions = []) throws -> AnyObject {
-        NSUnimplemented()
+        var buffer = [UInt8](repeating: 0, count: 1024)
+        var data = Data()
+        var bytesRead: Int?
+        repeat {
+            bytesRead = 0
+            if stream.hasBytesAvailable {
+                bytesRead = stream.read(&buffer, maxLength: buffer.count)
+                if bytesRead! > 0 {
+                    data.append(&buffer, count: bytesRead!)
+                }
+            }
+        } while bytesRead == buffer.count
+        return try jsonObject(with: data, options: opt)
     }
 }
 
@@ -633,11 +645,11 @@ private struct JSONReader {
         0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, // 0...9
         0x2E, 0x2D, 0x2B, 0x45, 0x65, // . - + E e
     ]
-    func parseNumber(_ input: Index) throws -> (Any, Index)? {
-        func parseTypedNumber(_ address: UnsafePointer<UInt8>, count: Int) -> (Any, IndexDistance)? {
+    func parseNumber(_ input: Index) throws -> (AnyObject, Index)? {
+        func parseTypedNumber(_ address: UnsafePointer<UInt8>, count: Int) -> (AnyObject, IndexDistance)? {
             let temp_buffer_size = 64
             var temp_buffer = [Int8](repeating: 0, count: temp_buffer_size)
-            return temp_buffer.withUnsafeMutableBufferPointer { (buffer: inout UnsafeMutableBufferPointer<Int8>) -> (Any, IndexDistance)? in
+            return temp_buffer.withUnsafeMutableBufferPointer { (buffer: inout UnsafeMutableBufferPointer<Int8>) -> (AnyObject, IndexDistance)? in
                 memcpy(buffer.baseAddress!, address, min(count, temp_buffer_size - 1)) // ensure null termination
 
                 let startPointer = buffer.baseAddress!
@@ -656,12 +668,12 @@ private struct JSONReader {
                 }
 
                 if intDistance == doubleDistance {
-                    return (intResult, intDistance)
+                    return (intResult._bridgeToObject(), intDistance)
                 }
                 guard doubleDistance > 0 else {
                     return nil
                 }
-                return (doubleResult, doubleDistance)
+                return (doubleResult._bridgeToObject(), doubleDistance)
             }
         }
 
@@ -686,24 +698,24 @@ private struct JSONReader {
     }
 
     //MARK: - Value parsing
-    func parseValue(_ input: Index) throws -> (Any, Index)? {
+    func parseValue(_ input: Index) throws -> (AnyObject, Index)? {
         if let (value, parser) = try parseString(input) {
-            return (value, parser)
+            return (value.bridge(), parser)
         }
         else if let parser = try consumeASCIISequence("true", input: input) {
-            return (true, parser)
+            return (true._bridgeToObject(), parser)
         }
         else if let parser = try consumeASCIISequence("false", input: input) {
-            return (false, parser)
+            return (false._bridgeToObject(), parser)
         }
         else if let parser = try consumeASCIISequence("null", input: input) {
             return (NSNull(), parser)
         }
         else if let (object, parser) = try parseObject(input) {
-            return (object, parser)
+            return (object.bridge(), parser)
         }
         else if let (array, parser) = try parseArray(input) {
-            return (array, parser)
+            return (array.bridge(), parser)
         }
         else if let (number, parser) = try parseNumber(input) {
             return (number, parser)