Revert "修复iOS12上的encode问题"

This reverts commit 9ab82ed.
intsig171 · Dec 6, 2024 · b66977b · b66977b
1 parent 9ab82ed
commit b66977b
Show file tree

Hide file tree

Showing 9 changed files with 488 additions and 851 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -8,7 +8,7 @@ PODS:
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
   - HandyJSON (5.0.0-beta.1)
-  - SmartCodable (4.3.1)
+  - SmartCodable (4.3.0-beta)
   - SnapKit (5.6.0)
 
 DEPENDENCIES:
@@ -39,7 +39,7 @@ SPEC CHECKSUMS:
   CleanJSON: 910a36465ce4829e264a902ccf6d1455fdd9f980
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
   HandyJSON: 582477127ab3ab65bd2e471815f1a7b846856978
-  SmartCodable: ff1dbe00d0b52644fb0cdc8e90258591a9dd1cf4
+  SmartCodable: 8985750f1bb521bf7f94ab898260d77f4dc32f24
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
 
 PODFILE CHECKSUM: 7f3af03f81934df0c035518074a7abbec8fa9d3f

diff --git a/Example/Pods/Local Podspecs/SmartCodable.podspec.json b/Example/Pods/Local Podspecs/SmartCodable.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/SmartCodable/SmartCodable-Info.plist b/Example/Pods/Target Support Files/SmartCodable/SmartCodable-Info.plist
diff --git a/SmartCodable.podspec b/SmartCodable.podspec
@@ -12,7 +12,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SmartCodable'
-  s.version          = '4.3.1'
+  s.version          = '4.3.0'
   s.summary          = '数据解析库'
 
   s.homepage         = 'https://github.com/intsig171'

diff --git a/SmartCodable/Classes/JSONValue/JSONParser.swift b/SmartCodable/Classes/JSONValue/JSONParser.swift
@@ -5,6 +5,7 @@
 //  Created by Mccc on 2024/5/17.
 //
 
+import Foundation
 internal struct JSONParser {
     var reader: DocumentReader
     var depth: Int = 0
@@ -90,7 +91,7 @@ internal struct JSONParser {
         self.depth += 1
         defer { depth -= 1 }
 
-        // parse first value or end immediately
+        // parse first value or end immediatly
         switch try reader.consumeWhitespace() {
         case ._space, ._return, ._newline, ._tab:
             preconditionFailure("Expected that all white space is consumed")
@@ -633,28 +634,10 @@ extension UInt8 {
     internal static let _backslash = UInt8(ascii: "\\")
 
 }
-
 extension Array where Element == UInt8 {
 
     internal static let _true = [UInt8(ascii: "t"), UInt8(ascii: "r"), UInt8(ascii: "u"), UInt8(ascii: "e")]
     internal static let _false = [UInt8(ascii: "f"), UInt8(ascii: "a"), UInt8(ascii: "l"), UInt8(ascii: "s"), UInt8(ascii: "e")]
     internal static let _null = [UInt8(ascii: "n"), UInt8(ascii: "u"), UInt8(ascii: "l"), UInt8(ascii: "l")]
 
 }
-
-enum JSONError: Swift.Error, Equatable {
-    case cannotConvertInputDataToUTF8
-    case unexpectedCharacter(ascii: UInt8, characterIndex: Int)
-    case unexpectedEndOfFile
-    case tooManyNestedArraysOrDictionaries(characterIndex: Int)
-    case invalidHexDigitSequence(String, index: Int)
-    case unexpectedEscapedCharacter(ascii: UInt8, in: String, index: Int)
-    case unescapedControlCharacterInString(ascii: UInt8, in: String, index: Int)
-    case expectedLowSurrogateUTF8SequenceAfterHighSurrogate(in: String, index: Int)
-    case couldNotCreateUnicodeScalarFromUInt32(in: String, index: Int, unicodeScalarValue: UInt32)
-    case numberWithLeadingZero(index: Int)
-    case numberIsNotRepresentableInSwift(parsed: String)
-    case singleFragmentFoundButNotAllowed
-    case invalidUTF8Sequence(Data, characterIndex: Int)
-}
-
diff --git a/SmartCodable/Classes/JSONValue/JSONValue.swift b/SmartCodable/Classes/JSONValue/JSONValue.swift
@@ -173,6 +173,22 @@ extension NSNumber {
         return nil
     }
 }
+enum JSONError: Swift.Error, Equatable {
+    case cannotConvertInputDataToUTF8
+    case unexpectedCharacter(ascii: UInt8, characterIndex: Int)
+    case unexpectedEndOfFile
+    case tooManyNestedArraysOrDictionaries(characterIndex: Int)
+    case invalidHexDigitSequence(String, index: Int)
+    case unexpectedEscapedCharacter(ascii: UInt8, in: String, index: Int)
+    case unescapedControlCharacterInString(ascii: UInt8, in: String, index: Int)
+    case expectedLowSurrogateUTF8SequenceAfterHighSurrogate(in: String, index: Int)
+    case couldNotCreateUnicodeScalarFromUInt32(in: String, index: Int, unicodeScalarValue: UInt32)
+    case numberWithLeadingZero(index: Int)
+    case numberIsNotRepresentableInSwift(parsed: String)
+    case singleFragmentFoundButNotAllowed
+    case invalidUTF8Sequence(Data, characterIndex: Int)
+}
+
 
 
 // for encdoe
@@ -378,12 +394,6 @@ extension JSONValue {
                         bytes.append(contentsOf: [._backslash, UInt8(ascii: "/")])
                         nextIndex = stringBytes.index(after: nextIndex)
                         startCopyIndex = nextIndex
-                    } else {
-                        // 如果不满足条件，直接把字符添加到 bytes 中
-                        bytes.append(contentsOf: stringBytes[startCopyIndex ..< nextIndex])
-                        bytes.append(stringBytes[nextIndex])
-                        nextIndex = stringBytes.index(after: nextIndex)
-                        startCopyIndex = nextIndex
                     }
 
                 default: