Skip to content

Parse JSON with value types #2966

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
merged 12 commits into from
Mar 1, 2021
Merged

Parse JSON with value types #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5daba85
Parse JSON with value types
fabianfett Dec 4, 2020
9b09903
Added a bunch of tests
fabianfett Jan 21, 2021
e5f4c47
Remove unused code and address code review
fabianfett Feb 3, 2021
13a74c7
Code review
fabianfett Feb 3, 2021
9552dd9
Move JSONParser to an extra file
fabianfett Feb 25, 2021
bd7d0da
Fixed a test for Swift 5.4
fabianfett Feb 25, 2021
e181507
Use constants
fabianfett Feb 25, 2021
3a30634
Refactor
fabianfett Feb 25, 2021
9e5d91d
Add new JSONSerialization+Parser.swift to CMakeList.txt
fabianfett Feb 26, 2021
6aa722c
Fix crash
fabianfett Feb 28, 2021
884cd69
Making everything much easier…
fabianfett Mar 1, 2021
222fab8
Final fixes
fabianfett Mar 1, 2021
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
4 changes: 4 additions & 0 deletions Foundation.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
3EA9D6701EF0532D00B362D6 /* TestJSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */; };
3EDCE50C1EF04D8100C2EC04 /* Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5051EF04D8100C2EC04 /* Codable.swift */; };
3EDCE5101EF04D8100C2EC04 /* JSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */; };
49D55FA125E84FE5007BD3B3 /* JSONSerialization+Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */; };
528776141BF2629700CB0090 /* FoundationErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522C253A1BF16E1600804FC6 /* FoundationErrors.swift */; };
528776191BF27D9500CB0090 /* Test.plist in Resources */ = {isa = PBXBuildFile; fileRef = 528776181BF27D9500CB0090 /* Test.plist */; };
555683BD1C1250E70041D4C6 /* TestUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 555683BC1C1250E70041D4C6 /* TestUserDefaults.swift */; };
Expand Down Expand Up @@ -804,6 +805,7 @@
3EDCE5051EF04D8100C2EC04 /* Codable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Codable.swift; sourceTree = "<group>"; };
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONEncoder.swift; sourceTree = "<group>"; };
400E22641C1A4E58007C5933 /* TestProcessInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestProcessInfo.swift; sourceTree = "<group>"; };
49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONSerialization+Parser.swift"; sourceTree = "<group>"; };
4AE109261C17CCBF007367B5 /* TestIndexPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestIndexPath.swift; sourceTree = "<group>"; };
4DC1D07F1C12EEEF00B5948A /* TestPipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPipe.swift; sourceTree = "<group>"; };
522C253A1BF16E1600804FC6 /* FoundationErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationErrors.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2080,6 +2082,7 @@
63DCE9D11EAA430100E9CB02 /* ISO8601DateFormatter.swift */,
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */,
EADE0B641BD15DFF00C49C64 /* JSONSerialization.swift */,
49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */,
EADE0B661BD15DFF00C49C64 /* LengthFormatter.swift */,
5BD70FB11D3D4CDC003B9BF8 /* Locale.swift */,
EADE0B681BD15DFF00C49C64 /* MassFormatter.swift */,
Expand Down Expand Up @@ -2868,6 +2871,7 @@
EADE0BB01BD15E0000C49C64 /* Port.swift in Sources */,
EADE0BB91BD15E0000C49C64 /* NSTextCheckingResult.swift in Sources */,
EA0812691DA71C8A00651B70 /* ProgressFraction.swift in Sources */,
49D55FA125E84FE5007BD3B3 /* JSONSerialization+Parser.swift in Sources */,
5BC1B9A821F275B000524D8C /* Collections+DataProtocol.swift in Sources */,
5BF7AEBE1BCD51F9008F214A /* NSTimeZone.swift in Sources */,
EADE0B951BD15DFF00C49C64 /* DateComponentsFormatter.swift in Sources */,
Expand Down
1 change: 1 addition & 0 deletions Sources/Foundation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ add_library(Foundation
ISO8601DateFormatter.swift
JSONEncoder.swift
JSONSerialization.swift
JSONSerialization+Parser.swift
LengthFormatter.swift
Locale.swift
MassFormatter.swift
Expand Down
Loading