Skip to content

Performance refactoring #1063

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
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Performance refactoring #1063

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2b0ede0
Add private Content type
May 21, 2020
3cabfac
Add Comparable conformance for Content
May 21, 2020
0a03b1c
Replace properties with content property, update init from jsonObject
May 21, 2020
d1a176d
Add private resolve content function
May 21, 2020
072aaed
Update object computed property behaviour, update function resolving …
May 21, 2020
228cd3e
Update collection conformance
May 21, 2020
5c1b693
Update subscripts
May 21, 2020
328128e
Update computed properties of all types
May 21, 2020
74b8077
Update computed properties of all types - 2
May 21, 2020
d5eeab5
Update comparable conformance
May 21, 2020
90d8bcc
Add error-init documentation
May 21, 2020
8d54483
Change name of function updating content
May 21, 2020
bd2fd7f
Style fixes
May 21, 2020
ee3d7b3
Remove unnecessary copy
May 21, 2020
6543ac4
Implement logic for <= and >= operators on indices
May 21, 2020
29ae026
Add documentation
May 21, 2020
fca3749
Minor fix
May 21, 2020
343bdcb
Minor fixes
May 21, 2020
e990432
Improve NSNumber isBool property implementation
May 22, 2020
b3e500f
Add performance test for deep dictionary lookup
May 22, 2020
95e8afa
Update number of performance test runs
May 22, 2020
c4d9fe4
Fix bool comparison
May 30, 2020
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
Prev Previous commit
Next Next commit
Update collection conformance
  • Loading branch information
Alexander Antonov committed May 21, 2020
commit 228cd3e5529fc7d9aed2d1de2e462575b9690e9c
38 changes: 24 additions & 14 deletions Source/SwiftyJSON/SwiftyJSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,34 +328,44 @@ extension JSON: Swift.Collection {
public typealias Index = JSONRawIndex

public var startIndex: Index {
switch type {
case .array: return .array(rawArray.startIndex)
case .dictionary: return .dictionary(rawDictionary.startIndex)
switch content {
case .array(let rawArray): return .array(rawArray.startIndex)
case .dictionary(let rawDictionary): return .dictionary(rawDictionary.startIndex)
default: return .null
}
}

public var endIndex: Index {
switch type {
case .array: return .array(rawArray.endIndex)
case .dictionary: return .dictionary(rawDictionary.endIndex)
switch content {
case .array(let rawArray): return .array(rawArray.endIndex)
case .dictionary(let rawDictionary): return .dictionary(rawDictionary.endIndex)
default: return .null
}
}

public func index(after i: Index) -> Index {
switch i {
case .array(let idx): return .array(rawArray.index(after: idx))
case .dictionary(let idx): return .dictionary(rawDictionary.index(after: idx))
default: return .null
switch content {
case .array(let rawArray):
guard case .array(let idx) = i else { return .null }
return .array(rawArray.index(after: idx))
case .dictionary(let rawDictionary):
guard case .dictionary(let idx) = i else { return .null }
return .dictionary(rawDictionary.index(after: idx))
default:
return .null
}
}

public subscript (position: Index) -> (String, JSON) {
switch position {
case .array(let idx): return (String(idx), JSON(rawArray[idx]))
case .dictionary(let idx): return (rawDictionary[idx].key, JSON(rawDictionary[idx].value))
default: return ("", JSON.null)
switch content {
case .array(let rawArray):
guard case .array(let idx) = position else { return ("", JSON.null) }
return (String(idx), JSON(rawArray[idx]))
case .dictionary(let rawDictionary):
guard case .dictionary(let idx) = position else { return ("", JSON.null) }
return (rawDictionary[idx].key, JSON(rawDictionary[idx].value))
default:
return ("", JSON.null)
}
}
}
Expand Down