Refactor more components to use enum

Stencil/Node.swift

@@ -138,31 +138,33 @@ public class ForNode : Node {
         if count == 4 && components[2] == "in" {
             let loopVariable = components[1]
             let variable = components[3]
-            let (nodes, error) = parser.parse(until(["endfor", "empty"]))
+
+            var forNodes:[Node]!
             var emptyNodes = [Node]()
 
-            if let error = error {
-                return .Error(error: error)
+            switch parser.parse(until(["endfor", "empty"])) {
+                case .Success(let nodes):
+                    forNodes = nodes
+                case .Error(let error):
+                    return .Error(error)
             }
 
             if let token = parser.nextToken() {
                 if token.contents == "empty" {
-                    let (nodes, error) = parser.parse(until(["endfor"]))
-                    parser.nextToken()
-
-                    if let error = error {
-                        return .Error(error: error)
-                    }
-
-                    if let nodes = nodes {
+                    switch parser.parse(until(["endfor"])) {
+                    case .Success(let nodes):
                         emptyNodes = nodes
+                    case .Error(let error):
+                        return .Error(error)
                     }
+
+                    parser.nextToken()
                 }
             } else {
                 return .Error(error: NodeError(token: token, message: "`endfor` was not found."))
             }
 
-            return .Success(node:ForNode(variable: variable, loopVariable: loopVariable, nodes: nodes!, emptyNodes:emptyNodes))
+            return .Success(node:ForNode(variable: variable, loopVariable: loopVariable, nodes: forNodes, emptyNodes:emptyNodes))
         }
 
         return .Error(error: NodeError(token: token, message: "Invalid syntax. Expected `for x in y`."))
@@ -206,61 +208,60 @@ public class IfNode : Node {
 
     public class func parse(parser:TokenParser, token:Token) -> TokenParser.Result {
         let variable = token.components()[1]
-
-        let (trueNodes, error) = parser.parse(until(["endif", "else"]))
-        if let error = error {
-            return .Error(error:error)
-        }
-
+        var trueNodes = [Node]()
         var falseNodes = [Node]()
 
+        switch parser.parse(until(["endif", "else"])) {
+            case .Success(let nodes):
+                trueNodes = nodes
+            case .Error(let error):
+                return .Error(error)
+        }
+
         if let token = parser.nextToken() {
             if token.contents == "else" {
-                let (nodes, error) = parser.parse(until(["endif"]))
+                switch parser.parse(until(["endif"])) {
+                    case .Success(let nodes):
+                        falseNodes = nodes
+                    case .Error(let error):
+                        return .Error(error)
+                }
                 parser.nextToken()
-
-                if let error = error {
-                    return .Error(error:error)
-                }
-
-                if let nodes = nodes {
-                    falseNodes = nodes
-                }
             }
         } else {
             return .Error(error:NodeError(token: token, message: "`endif` was not found."))
         }
 
-        return .Success(node:IfNode(variable: variable, trueNodes: trueNodes!, falseNodes: falseNodes))
+        return .Success(node:IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes))
     }
 
     public class func parse_ifnot(parser:TokenParser, token:Token) -> TokenParser.Result {
         let variable = token.components()[1]
-
-        let (falseNodes, error) = parser.parse(until(["endif", "else"]))
-        if let error = error {
-            return .Error(error:error)
-        }
         var trueNodes = [Node]()
+        var falseNodes = [Node]()
+
+        switch parser.parse(until(["endif", "else"])) {
+        case .Success(let nodes):
+            falseNodes = nodes
+        case .Error(let error):
+            return .Error(error)
+        }
 
         if let token = parser.nextToken() {
             if token.contents == "else" {
-                let (nodes, error) = parser.parse(until(["endif"]))
-                if let error = error {
-                    return .Error(error:error)
-                }
-
-                if let nodes = nodes {
+                switch parser.parse(until(["endif"])) {
+                case .Success(let nodes):
                     trueNodes = nodes
+                case .Error(let error):
+                    return .Error(error)
                 }
-
                 parser.nextToken()
             }
         } else {
-            return .Error(error: NodeError(token: token, message: "`endif` was not found."))
+            return .Error(error:NodeError(token: token, message: "`endif` was not found."))
         }
 
-        return .Success(node: IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes!))
+        return .Success(node:IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes))
     }
 
     public init(variable:String, trueNodes:[Node], falseNodes:[Node]) {

Stencil/Parser.swift

@@ -13,12 +13,18 @@ public func until(tags:[String])(parser:TokenParser, token:Token) -> Bool {
 }
 
 public class TokenParser {
+    public typealias TagParser = (TokenParser, Token) -> Result
+    public typealias NodeList = [Node]
+
     public enum Result {
         case Success(node: Node)
         case Error(error: Stencil.Error)
     }
-    
-    typealias TagParser = (TokenParser, Token) -> Result
+
+    public enum Results {
+        case Success(nodes: NodeList)
+        case Error(error: Stencil.Error)
+    }
 
     private var tokens:[Token]
     private var tags = Dictionary<String, TagParser>()
@@ -31,12 +37,12 @@ public class TokenParser {
         tags["ifnot"] = IfNode.parse_ifnot
     }
 
-    public func parse() -> (nodes:[Node]?, error:Error?) {
+    public func parse() -> Results {
         return parse(nil)
     }
 
-    public func parse(parse_until:((parser:TokenParser, token:Token) -> (Bool))?) -> (nodes:[Node]?, error:Error?) {
-        var nodes = [Node]()
+    public func parse(parse_until:((parser:TokenParser, token:Token) -> (Bool))?) -> TokenParser.Results {
+        var nodes = NodeList()
 
         while tokens.count > 0 {
             let token = nextToken()!
@@ -52,7 +58,7 @@ public class TokenParser {
                 if let parse_until = parse_until {
                     if parse_until(parser: self, token: token) {
                         prependToken(token)
-                        return (nodes, nil)
+                        return .Success(nodes:nodes)
                     }
                 }
 
@@ -62,7 +68,7 @@ public class TokenParser {
                             case .Success(let node):
                                 nodes.append(node)
                             case .Error(let error):
-                                return (nil, error)
+                                return .Error(error:error)
                         }
                     }
                 }
@@ -71,7 +77,7 @@ public class TokenParser {
             }
         }
 
-        return (nodes, nil)
+        return .Success(nodes:nodes)
     }
 
     public func nextToken() -> Token? {

Stencil/Template.swift

@@ -37,18 +37,18 @@ public class Template {
     }
 
     public func render(context:Context) -> Result {
-        let (nodes, error) = parser.parse()
+        switch parser.parse() {
+            case .Success(let nodes):
+                let (result, error) = renderNodes(nodes, context)
+                if let result = result {
+                    return .Success(string:result)
+                } else if let error = error {
+                    return .Error(error:error)
+                }
+                return .Success(string:"")
 
-        if let error = error {
-            return .Error(error: error)
-        } else if let nodes = nodes {
-            let result = renderNodes(nodes, context)
-            if let string = result.0 {
-                return .Success(string: string)
-            } else {
-                return .Error(error: result.1!)
-            }
+            case .Error(let error):
+                return .Error(error:error)
         }
-        return .Success(string: "")
     }
 }