Updates for latest Sparse version

johnpatrickmorgan · Jan 16, 2019 · fabebe6 · fabebe6
1 parent 1268a43
commit fabebe6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/Sources/App/Controllers/OutputController.swift b/Sources/App/Controllers/OutputController.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Vapor
+import Sparse
 
 class OutputController {
 
@@ -24,15 +25,15 @@ class OutputController {
 
             return try req.view().render("output", node)
 
-        } catch let error as ParsingError {
+        } catch let error as ParserError {
 
             let context = [
                 "prefill": trimmedInput,
-                "error": error.parsingErrorDescription
+                "error": error.description
             ]
 
             let logger = try req.make(Logger.self)
-            logger.error(["PARSING ERROR:", trimmedInput, error.parsingErrorDescription].joined(separator: "\n"))
+            logger.error(["PARSING ERROR:", trimmedInput, error.description].joined(separator: "\n"))
 
             return try req.view().render("input", context)
         }

diff --git a/Sources/App/Models/Errors/ParsingError.swift b/Sources/App/Models/Errors/ParsingError.swift
diff --git a/Sources/App/Parsing/ConstraintsParser.swift b/Sources/App/Parsing/ConstraintsParser.swift
@@ -8,7 +8,7 @@ enum ConstraintsParser {
     static func parse(input: String) throws -> ConstraintGroup {
 
         let stream = Stream(input)
-        let constraints = try constraintsLog._run(stream)
+        let constraints = try constraintsLog.parse(stream)
 
         return ConstraintGroup(constraints, raw: input)
     }