Merge pull request #1 from nubank/swift_4.1

Makes Freddy compatible with Swift 4.1
nubank · Oct 10, 2018 · 6277430 · 6277430
2 parents b416633 + dacc80c
commit 6277430
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Sources/IntExtensions.swift b/Sources/IntExtensions.swift
@@ -26,7 +26,7 @@ import Foundation
         }
 
         func addingReportingOverflow(other: Int) -> (partialValue: Int, overflow: ArithmeticOverflow) {
-            let (exponent, overflow) = Int.addWithOverflow(self, other)
+            let (exponent, overflow) = self.addingReportingOverflow(other)
             return (exponent, ArithmeticOverflow(overflow))
         }
     }

diff --git a/Sources/JSONParser.swift b/Sources/JSONParser.swift
@@ -455,13 +455,14 @@ public struct JSONParser {
                 parser.parseLeadingZero()
 
             case .preDecimalDigits:
+                let parserStart = parser.start
                 try parser.parsePreDecimalDigits { c in
                     guard case let (exponent, .none) = 10.multipliedReportingOverflow(other: value) else {
-                        throw InternalError.numberOverflow(offset: parser.start)
+                        throw InternalError.numberOverflow(offset: parserStart)
                     }
 
                     guard case let (newValue, .none) = exponent.addingReportingOverflow(other: Int(c - Literal.zero)) else {
-                        throw InternalError.numberOverflow(offset: parser.start)
+                        throw InternalError.numberOverflow(offset: parserStart)
                     }
 
                     value = newValue