Skip to content

Updated readTag to handle map types. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jallum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated readTag to handle map types. #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions swift/lib/ProtocGenSwift/ProtocGenSwift/JSONReader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

public class JSONReader : Reader {
typealias RepeatedObject = (key: Int, generator: NSArray.Generator)
typealias RepeatedObject = (key: Int, generator: AnyGenerator<AnyObject>)

var generatorStack: [NSDictionary.Generator] = []
var generator: NSDictionary.Generator
Expand Down Expand Up @@ -34,7 +34,19 @@ public class JSONReader : Reader {
while let (key, value) = generator.next() {
if let (tag, repeated) = tagMap[key as! String] {
if repeated {
repeatedObject = (key: tag, generator: (value as! NSArray).generate())
if let array = value as? [AnyObject] {
var generator = array.generate()
repeatedObject = (key: tag, generator: anyGenerator { generator.next() })
} else if let dict = value as? [String: AnyObject] {
var generator = dict.generate()
repeatedObject = (key: tag, generator: anyGenerator {
if let (key, value) = generator.next() {
return ["key": key, "value": value]
} else {
return nil
}
})
}
object = repeatedObject?.generator.next()
} else {
object = value
Expand Down Expand Up @@ -143,4 +155,4 @@ public class JSONReader : Reader {
repeatedObject = repeatedObjectStack.removeLast()
}
}
}
}