Skip to content
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

Jump to bottom

3 24 migration, works for OSX and Linux #1

Merged
merged 14 commits into from
Apr 4, 2016
Merged

3 24 migration, works for OSX and Linux #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1ddae13
Use minimumCapacity parameter to optimize dictionary creations
Adlai-Holler Dec 9, 2015
64b832c
Changed from .empty to .isEmpty
kandelvijaya Jan 28, 2016
49f588e
Which's -> whose and typo fix in comments
kandelvijaya Jan 31, 2016
5fc4545
Rename isExists to exists. Fixes #448
CraigSiemens Feb 17, 2016
20ee3ed
Replace ++ with +=
Mar 1, 2016
9858784
Merge pull request #419 from Adlai-Holler/ReserveCapacity
lingoer Mar 15, 2016
fe96b92
Merge pull request #467 from glennrfisher/master
lingoer Mar 15, 2016
653cf8c
Merge pull request #457 from CraigSiemens/master
lingoer Mar 15, 2016
33b383c
Merge pull request #446 from kandelvijaya/patch-2
lingoer Mar 15, 2016
2a5b70f
Merge pull request #443 from kandelvijaya/patch-1
lingoer Mar 15, 2016
582736b
IBM-Swift/Kitura#328 swiftyJson changes to work on Linux with 3/24 Sw…
tfrank64 Mar 30, 2016
772ce02
created OS X branch with swift 3_24 changes
tfrank64 Mar 31, 2016
c571c7f
updated branch with latest from SwiftyJson/SwiftyJson
tfrank64 Mar 31, 2016
c4d27a7
IBM-Swift/Kitura#328 merging linux and OS X source code
tfrank64 Apr 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions Source/LclJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
**/

#if os(Linux)

import Foundation

public let LclErrorDomain = "Lcl.Error.Domain"
Expand Down Expand Up @@ -48,7 +50,7 @@ public class LclJSONSerialization {
}

let mirror = Mirror(reflecting: obj)
if mirror.displayStyle == .Collection {
if mirror.displayStyle == .collection {
// object is Swift.Array
for element in mirror.children {
guard isValidJSONObjectInternal(element.value) else {
Expand All @@ -57,12 +59,12 @@ public class LclJSONSerialization {
}
return true
}
else if mirror.displayStyle == .Dictionary {
else if mirror.displayStyle == .dictionary {
// object is Swift.Dictionary
for pair in mirror.children {
let pairMirror = Mirror(reflecting: pair.value)
if pairMirror.displayStyle == .Tuple && pairMirror.children.count == 2 {
let generator = pairMirror.children.generate()
if pairMirror.displayStyle == .tuple && pairMirror.children.count == 2 {
let generator = pairMirror.children.makeIterator()
if generator.next()!.value is String {
guard isValidJSONObjectInternal(generator.next()!.value) else {
return false
Expand All @@ -88,7 +90,7 @@ public class LclJSONSerialization {

// top level object must be an Swift.Array or Swift.Dictionary
let mirror = Mirror(reflecting: obj)
guard mirror.displayStyle == .Collection || mirror.displayStyle == .Dictionary else {
guard mirror.displayStyle == .collection || mirror.displayStyle == .dictionary else {
return false
}

Expand Down Expand Up @@ -137,10 +139,10 @@ public class LclJSONSerialization {
}
else {
let mirror = Mirror(reflecting: obj)
if mirror.displayStyle == .Collection {
if mirror.displayStyle == .collection {
try writeJsonArray(mirror.children.map { $0.value as Any }, padding: padding, writer: writer)
}
else if mirror.displayStyle == .Dictionary {
else if mirror.displayStyle == .dictionary {
try writeJsonObject(mirror.children.map { $0.value }, padding: padding, writer: writer)
}
else {
Expand All @@ -161,8 +163,8 @@ public class LclJSONSerialization {
let realComma = NSString(string: ",")
for pair in pairs {
let pairMirror = Mirror(reflecting: pair)
if pairMirror.displayStyle == .Tuple && pairMirror.children.count == 2 {
let generator = pairMirror.children.generate()
if pairMirror.displayStyle == .tuple && pairMirror.children.count == 2 {
let generator = pairMirror.children.makeIterator()
if let key = generator.next()!.value as? String {
let value = generator.next()!.value
writer(comma)
Expand Down Expand Up @@ -233,3 +235,4 @@ public class LclJSONSerialization {
return NSError(domain: LclErrorDomain, code: 1, userInfo: userInfo)
}
}
#endif