Implement the Serializer.

Author: Lukasa

Sources/StructuredHeaders/ASCII.swift

@@ -0,0 +1,51 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the SwiftNIO open source project
+//
+// Copyright (c) 2020 Apple Inc. and the SwiftNIO project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+let asciiSpace = UInt8(ascii: " ")
+let asciiTab = UInt8(ascii: "\t")
+let asciiOpenParenthesis = UInt8(ascii: "(")
+let asciiCloseParenthesis = UInt8(ascii: ")")
+let asciiDash = UInt8(ascii: "-")
+let asciiUnderscore = UInt8(ascii: "_")
+let asciiZero = UInt8(ascii: "0")
+let asciiOne = UInt8(ascii: "1")
+let asciiNine = UInt8(ascii: "9")
+let asciiDigits = asciiZero...asciiNine
+let asciiDquote = UInt8(ascii: "\"")
+let asciiColon = UInt8(ascii: ":")
+let asciiSemicolon = UInt8(ascii: ";")
+let asciiBackslash = UInt8(ascii: "\\")
+let asciiQuestionMark = UInt8(ascii: "?")
+let asciiExclamationMark = UInt8(ascii: "!")
+let asciiOctothorpe = UInt8(ascii: "#")
+let asciiDollar = UInt8(ascii: "$")
+let asciiPercent = UInt8(ascii: "%")
+let asciiAmpersand = UInt8(ascii: "&")
+let asciiSquote = UInt8(ascii: "'")
+let asciiCaret = UInt8(ascii: "^")
+let asciiBacktick = UInt8(ascii: "`")
+let asciiPipe = UInt8(ascii: "|")
+let asciiTilde = UInt8(ascii: "~")
+let asciiAsterisk = UInt8(ascii: "*")
+let asciiEqual = UInt8(ascii: "=")
+let asciiPlus = UInt8(ascii: "+")
+let asciiSlash = UInt8(ascii: "/")
+let asciiPeriod = UInt8(ascii: ".")
+let asciiComma = UInt8(ascii: ",")
+let asciiCapitalA = UInt8(ascii: "A")
+let asciiCapitalZ = UInt8(ascii: "Z")
+let asciiLowerA = UInt8(ascii: "a")
+let asciiLowerZ = UInt8(ascii: "z")
+let asciiCapitals = asciiCapitalA...asciiCapitalZ
+let asciiLowercases = asciiLowerA...asciiLowerZ

Sources/StructuredHeaders/ComponentTypes.swift

@@ -29,7 +29,7 @@ extension ItemOrInnerList: Hashable { }
 public enum BareItem<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence == BaseData, BaseData: Hashable {
     case bool(Bool)
     case integer(Int)
-    case decimal(Float64)  // Not great, can we do better?
+    case decimal(PseudoDecimal)
     case string(String)
     case undecodedByteSequence(BaseData)
     case token(BaseData)
@@ -49,7 +49,7 @@ extension BareItem: ExpressibleByIntegerLiteral {
 
 extension BareItem: ExpressibleByFloatLiteral {
     public init(floatLiteral value: Float64) {
-        self = .decimal(value)
+        self = .decimal(.init(floatLiteral: value))
     }
 }
 
@@ -65,6 +65,11 @@ extension BareItem: Hashable { }
 public struct Item<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence == BaseData, BaseData: Hashable {
     public var bareItem: BareItem<BaseData>
     public var parameters: OrderedMap<BaseData, BareItem<BaseData>>
+
+    public init(bareItem: BareItem<BaseData>, parameters: OrderedMap<BaseData, BareItem<BaseData>>) {
+        self.bareItem = bareItem
+        self.parameters = parameters
+    }
 }
 
 extension Item: Hashable { }
@@ -144,4 +149,9 @@ extension BareInnerList.Index: Comparable {
 public struct InnerList<BaseData: RandomAccessCollection>: Hashable where BaseData.Element == UInt8, BaseData.SubSequence == BaseData, BaseData: Hashable {
     public var bareInnerList: BareInnerList<BaseData>
     public var parameters: OrderedMap<BaseData, BareItem<BaseData>>
+
+    public init(bareInnerList: BareInnerList<BaseData>, parameters: OrderedMap<BaseData, BareItem<BaseData>>) {
+        self.bareInnerList = bareInnerList
+        self.parameters = parameters
+    }
 }

Sources/StructuredHeaders/Decoder/BareItemDecoder.swift

@@ -142,7 +142,8 @@ extension BareItemDecoder: SingleValueDecodingContainer {
             throw StructuredHeaderError.invalidTypeForItem
         }
 
-        return T(decimal)
+        // Going via Double is a bit sad. Swift Numerics would help here.
+        return T(Double(decimal))
     }
 
     private func _decodeFixedWidthInteger<T: FixedWidthInteger>(_ type: T.Type) throws -> T {

Sources/StructuredHeaders/Errors.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// MARK:- StructuredHeaderError
 public struct StructuredHeaderError: Error {
     private enum _BaseError: Hashable {
         case invalidTrailingBytes

Sources/StructuredHeaders/FieldParser.swift

@@ -12,44 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-fileprivate let asciiSpace = UInt8(ascii: " ")
-fileprivate let asciiTab = UInt8(ascii: "\t")
-fileprivate let asciiOpenParenthesis = UInt8(ascii: "(")
-fileprivate let asciiCloseParenthesis = UInt8(ascii: ")")
-fileprivate let asciiDash = UInt8(ascii: "-")
-fileprivate let asciiUnderscore = UInt8(ascii: "_")
-fileprivate let asciiZero = UInt8(ascii: "0")
-fileprivate let asciiOne = UInt8(ascii: "1")
-fileprivate let asciiNine = UInt8(ascii: "9")
-fileprivate let asciiDigits = asciiZero...asciiNine
-fileprivate let asciiDquote = UInt8(ascii: "\"")
-fileprivate let asciiColon = UInt8(ascii: ":")
-fileprivate let asciiSemicolon = UInt8(ascii: ";")
-fileprivate let asciiBackslash = UInt8(ascii: "\\")
-fileprivate let asciiQuestionMark = UInt8(ascii: "?")
-fileprivate let asciiExclamationMark = UInt8(ascii: "!")
-fileprivate let asciiOctothorpe = UInt8(ascii: "#")
-fileprivate let asciiDollar = UInt8(ascii: "$")
-fileprivate let asciiPercent = UInt8(ascii: "%")
-fileprivate let asciiAmpersand = UInt8(ascii: "&")
-fileprivate let asciiSquote = UInt8(ascii: "'")
-fileprivate let asciiCaret = UInt8(ascii: "^")
-fileprivate let asciiBacktick = UInt8(ascii: "`")
-fileprivate let asciiPipe = UInt8(ascii: "|")
-fileprivate let asciiTilde = UInt8(ascii: "~")
-fileprivate let asciiAsterisk = UInt8(ascii: "*")
-fileprivate let asciiEqual = UInt8(ascii: "=")
-fileprivate let asciiPlus = UInt8(ascii: "+")
-fileprivate let asciiSlash = UInt8(ascii: "/")
-fileprivate let asciiPeriod = UInt8(ascii: ".")
-fileprivate let asciiComma = UInt8(ascii: ",")
-fileprivate let asciiCapitalA = UInt8(ascii: "A")
-fileprivate let asciiCapitalZ = UInt8(ascii: "Z")
-fileprivate let asciiLowerA = UInt8(ascii: "a")
-fileprivate let asciiLowerZ = UInt8(ascii: "z")
-fileprivate let asciiCapitals = asciiCapitalA...asciiCapitalZ
-fileprivate let asciiLowercases = asciiLowerA...asciiLowerZ
-
 /// A FieldParser is the basic parsing object for structured header fields represented as lists.
 public struct StructuredFieldParser<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence: Hashable {
     // Right now I'm on the fence about whether this should be generic. It's convenient,
@@ -322,8 +284,9 @@ extension StructuredFieldParser {
             }
 
             // Same notes here as above
-            let baseFloat = Float64(String(decoding: integerBytes, as: UTF8.self))!
-            return .decimal(baseFloat * Float64(sign))
+            var decimal = PseudoDecimal(bytes: integerBytes)
+            decimal.mantissa *= Int64(sign)
+            return .decimal(decimal)
         }
     }