Skip to content

Making SourceKit not freak out about self.object.count being called #68

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

Merged
LukeTangPL merged 1 commit into from
Oct 10, 2014
Merged

Making SourceKit not freak out about self.object.count being called #68

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
12 changes: 8 additions & 4 deletions Source/SwiftyJSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ extension JSON: SequenceType{
public var count: Int {
get {
switch self.type {
case .Array, .Dictionary:
return self.object.count
case .Array:
return self.arrayValue.count
case .Dictionary:
return self.dictionaryValue.count
default:
return 0
}
Expand Down Expand Up @@ -478,8 +480,10 @@ extension JSON: BooleanType {
switch self.type {
case .Bool, .Number, .String:
return self.object.boolValue
case .Array, .Dictionary:
return self.object.count > 0
case .Array:
return self.arrayValue.count > 0
case .Dictionary:
return self.dictionaryValue.count > 0
case .Null:
return false
default:
Expand Down