Skip to content

Commit 883dfb8

Browse files
authored
Merge pull request #2966 from fabianfett/ff-json-parsing
Parse JSON with value types
2 parents 2959fc8 + 222fab8 commit 883dfb8

File tree

5 files changed

+1086
-625
lines changed

5 files changed

+1086
-625
lines changed

Foundation.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
3EA9D6701EF0532D00B362D6 /* TestJSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA9D66F1EF0532D00B362D6 /* TestJSONEncoder.swift */; };
8787
3EDCE50C1EF04D8100C2EC04 /* Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5051EF04D8100C2EC04 /* Codable.swift */; };
8888
3EDCE5101EF04D8100C2EC04 /* JSONEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */; };
89+
49D55FA125E84FE5007BD3B3 /* JSONSerialization+Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */; };
8990
528776141BF2629700CB0090 /* FoundationErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522C253A1BF16E1600804FC6 /* FoundationErrors.swift */; };
9091
528776191BF27D9500CB0090 /* Test.plist in Resources */ = {isa = PBXBuildFile; fileRef = 528776181BF27D9500CB0090 /* Test.plist */; };
9192
555683BD1C1250E70041D4C6 /* TestUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 555683BC1C1250E70041D4C6 /* TestUserDefaults.swift */; };
@@ -804,6 +805,7 @@
804805
3EDCE5051EF04D8100C2EC04 /* Codable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Codable.swift; sourceTree = "<group>"; };
805806
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONEncoder.swift; sourceTree = "<group>"; };
806807
400E22641C1A4E58007C5933 /* TestProcessInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestProcessInfo.swift; sourceTree = "<group>"; };
808+
49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONSerialization+Parser.swift"; sourceTree = "<group>"; };
807809
4AE109261C17CCBF007367B5 /* TestIndexPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestIndexPath.swift; sourceTree = "<group>"; };
808810
4DC1D07F1C12EEEF00B5948A /* TestPipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPipe.swift; sourceTree = "<group>"; };
809811
522C253A1BF16E1600804FC6 /* FoundationErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationErrors.swift; sourceTree = "<group>"; };
@@ -2080,6 +2082,7 @@
20802082
63DCE9D11EAA430100E9CB02 /* ISO8601DateFormatter.swift */,
20812083
3EDCE5091EF04D8100C2EC04 /* JSONEncoder.swift */,
20822084
EADE0B641BD15DFF00C49C64 /* JSONSerialization.swift */,
2085+
49D55FA025E84FE5007BD3B3 /* JSONSerialization+Parser.swift */,
20832086
EADE0B661BD15DFF00C49C64 /* LengthFormatter.swift */,
20842087
5BD70FB11D3D4CDC003B9BF8 /* Locale.swift */,
20852088
EADE0B681BD15DFF00C49C64 /* MassFormatter.swift */,
@@ -2868,6 +2871,7 @@
28682871
EADE0BB01BD15E0000C49C64 /* Port.swift in Sources */,
28692872
EADE0BB91BD15E0000C49C64 /* NSTextCheckingResult.swift in Sources */,
28702873
EA0812691DA71C8A00651B70 /* ProgressFraction.swift in Sources */,
2874+
49D55FA125E84FE5007BD3B3 /* JSONSerialization+Parser.swift in Sources */,
28712875
5BC1B9A821F275B000524D8C /* Collections+DataProtocol.swift in Sources */,
28722876
5BF7AEBE1BCD51F9008F214A /* NSTimeZone.swift in Sources */,
28732877
EADE0B951BD15DFF00C49C64 /* DateComponentsFormatter.swift in Sources */,

Sources/Foundation/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ add_library(Foundation
3737
ISO8601DateFormatter.swift
3838
JSONEncoder.swift
3939
JSONSerialization.swift
40+
JSONSerialization+Parser.swift
4041
LengthFormatter.swift
4142
Locale.swift
4243
MassFormatter.swift

0 commit comments

Comments
 (0)