More security guards :-P

stencilproject · Oct 18, 2015 · b06d3e5 · b06d3e5
1 parent 88aa28b
commit b06d3e5
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Stencil/Node.swift b/Stencil/Node.swift
@@ -141,13 +141,14 @@ public class ForNode : NodeType {
     }
     parser.eatNextCRLF() // if CRLF after {% endfor %}, eat it
 
-    return ForNode(variable: variable, loopVariable: loopVariable, nodes: forNodes, emptyNodes:emptyNodes)
+    return ForNode(variable: variable, loopVariable: loopVariable, nodes: forNodes, emptyNodes: emptyNodes)
   }
 
   public init(variable:String, loopVariable:String, nodes:[NodeType], emptyNodes:[NodeType]) {
     self.variable = Variable(variable)
     self.loopVariable = loopVariable
     self.nodes = nodes
+    // TODO: Handle emptyNodes
   }
 
   public func render(context: Context) throws -> String {
@@ -171,7 +172,11 @@ public class IfNode : NodeType {
   public let falseNodes:[NodeType]
 
   public class func parse(parser:TokenParser, token:Token) throws -> NodeType {
-    let variable = token.components()[1]
+    let components = token.components()
+    guard components.count == 2 else {
+      throw TemplateSyntaxError("'if' statements should use the following 'if condition' `\(token.contents)`.")
+    }
+    let variable = components[1]
     var trueNodes = [NodeType]()
     var falseNodes = [NodeType]()
 
@@ -193,7 +198,11 @@ public class IfNode : NodeType {
   }
 
   public class func parse_ifnot(parser:TokenParser, token:Token) throws -> NodeType {
-    let variable = token.components()[1]
+    let components = token.components()
+    guard components.count == 2 else {
+      throw TemplateSyntaxError("'ifnot' statements should use the following 'if condition' `\(token.contents)`.")
+    }
+    let variable = components[1]
     var trueNodes = [NodeType]()
     var falseNodes = [NodeType]()