Merge pull request #49 from vapor/build-errors

Build errors

Author: loganwright

.gitignore

@@ -2,3 +2,4 @@
 /.build
 /Packages
 /*.xcodeproj
+Package.pins

.travis.yml

@@ -6,5 +6,5 @@ sudo: required
 dist: trusty
 osx_image: xcode8
 script:
-  - eval "$(curl -sL swift.vapor.sh/ci)"
+  - eval "$(curl -sL swift.vapor.sh/ci-3.1)"
   - eval "$(curl -sL swift.vapor.sh/codecov)"

Sources/Leaf/Buffer/Buffer+Leaf.swift

@@ -95,7 +95,7 @@ extension BufferProtocol where Element == Byte {
         guard current == .leftParenthesis else {
             throw ParseError.expectedOpenParenthesis
         }
-        return name.string
+        return name.makeString()
     }
 
     mutating func extractInstructionParameters() throws -> [Parameter] {
@@ -106,13 +106,13 @@ extension BufferProtocol where Element == Byte {
     mutating func extractBody() throws -> String {
         return try extractSection(opensWith: .leftCurlyBracket, closesWith: .rightCurlyBracket)
             .trimmed(.whitespace)
-            .string
+            .makeString()
     }
 
     mutating func extractSection(opensWith opener: Byte, closesWith closer: Byte) throws -> Bytes {
         guard current ==  opener else {
-            let have = current.flatMap { [$0] }?.string
-            throw ParseError.missingBodyOpener(expected: [opener].string, have: have)
+            let have = current.flatMap { [$0] }?.makeString()
+            throw ParseError.missingBodyOpener(expected: [opener].makeString(), have: have)
         }
 
         var subBodies = 0
@@ -129,7 +129,7 @@ extension BufferProtocol where Element == Byte {
         }
 
         guard current == closer else {
-            throw ParseError.missingBodyCloser(expected: [closer].string)
+            throw ParseError.missingBodyCloser(expected: [closer].makeString())
         }
 
         return body

Sources/Leaf/Context.swift

@@ -39,7 +39,7 @@ public final class Context {
 
     // TODO: Subscripts
 
-    func get<T: PathIndex>(path: [T]) -> Node? {
+    func get<T: PathIndexer>(path: [T]) -> Node? {
         var next = queue.tip
         repeat {
             if let value = next?.value[path] { return value }

Sources/Leaf/HTMLEscape.swift

@@ -38,6 +38,6 @@ extension String {
             .joined(separator: "<".makeBytes())
             .split(separator: .greaterThan, omittingEmptySubsequences: false)
             .joined(separator: ">".makeBytes())
-            .string
+            .makeString()
     }
 }

Sources/Leaf/LeafComponent.swift

@@ -23,7 +23,7 @@ extension Leaf.Component: CustomStringConvertible {
     public var description: String {
         switch self {
         case let .raw(r):
-            return ".raw(\(r.string))"
+            return ".raw(\(r.makeString()))"
         case let .tagTemplate(i):
             return ".tagTemplate(\(i))"
         case let .chain(chain):

Sources/Leaf/Node+Rendered.swift

@@ -1,6 +1,6 @@
 extension Node {
     func rendered() throws -> Bytes {
-        switch self {
+        switch self.wrapped {
         case .array(_), .object(_), .null:
             return []
         case let .bool(bool):

Sources/Leaf/Parameter.swift

@@ -48,13 +48,13 @@ extension Parameter {
         let bytes = bytes.array.trimmed(.whitespace)
         guard !bytes.isEmpty else { throw Error.nonEmptyArgumentRequired }
         if bytes.count > 1, bytes.first == .quote, bytes.last == .quote {
-            self = .constant(value: bytes.dropFirst().dropLast().string)
+            self = .constant(value: bytes.dropFirst().dropLast().makeString())
         } else {
             let path = bytes.split(
                     separator: .period,
                     omittingEmptySubsequences: true
                 )
-                .map { $0.string }
+                .map { $0.makeString() }
             self = .variable(path: path)
         }
     }

Sources/Leaf/Stem+Spawn.swift

@@ -7,7 +7,7 @@ extension Stem {
         let raw = raw.trimmed(.whitespace)
         var buffer = Buffer(raw)
         let components = try buffer.components(stem: self).map(postCompile)
-        var leaf = Leaf(raw: raw.string, components: components)
+        var leaf = Leaf(raw: raw.makeString(), components: components)
         try tags.values.forEach {
             leaf = try $0.postCompile(stem: self, leaf: leaf)
         }
@@ -26,7 +26,7 @@ extension Stem {
             let path = workingDirectory + name
             let bytes = try Bytes.load(path: path)
             let component = Leaf.Component.raw(bytes)
-            let leaf = Leaf(raw: bytes.string, components: [component])
+            let leaf = Leaf(raw: bytes.makeString(), components: [component])
             cache(leaf, named: name)
             return leaf
         }

Sources/Leaf/Tag/Models/Equal.swift

@@ -25,16 +25,16 @@ fileprivate func fuzzyEquals(_ lhs: Node?, _ rhs: Node?) -> Bool {
     let lhs = lhs ?? .null
     let rhs = rhs ?? .null
 
-    switch lhs {
+    switch lhs.wrapped {
     case let .array(lhs):
-        guard let rhs = rhs.nodeArray else { return false }
+        guard let rhs = rhs.array else { return false }
         guard lhs.count == rhs.count else { return false }
-        for (l, r) in zip(lhs, rhs) where !fuzzyEquals(l, r) { return false }
+        for (l, r) in zip(lhs, rhs) where !fuzzyEquals(Node(l), r) { return false }
         return true
     case let .bool(bool):
         return bool == rhs.bool
     case let .bytes(bytes):
-        guard case let .bytes(rhs) = rhs else { return false }
+        guard case let .bytes(rhs) = rhs.wrapped else { return false }
         return bytes == rhs
     case .null:
         return rhs.isNull
@@ -48,15 +48,15 @@ fileprivate func fuzzyEquals(_ lhs: Node?, _ rhs: Node?) -> Bool {
             return uint == rhs.uint
         }
     case let .object(lhs):
-        guard let rhs = rhs.nodeObject else { return false }
+        guard let rhs = rhs.object else { return false }
         guard lhs.count == rhs.count else { return false }
-        for (k, v) in lhs where !fuzzyEquals(v, rhs[k]) { return false }
+        for (k, v) in lhs where !fuzzyEquals(Node(v), rhs[k]) { return false }
         return true
     case let .string(string):
         return string == rhs.string
     case let .date(date):
         // FIXME: Add fuzzy date access and equality?
-        guard case let .date(right) = rhs else { return false }
+        guard case let .date(right) = rhs.wrapped else { return false }
         return date == right
     }
 }