swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow node parsing to return an error

Browse Source 
Closes #5
This commit is contained in:
Kyle Fuller
2014-10-26 12:11:40 +00:00
parent aad8a1884c
commit 925c663555
5 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Stencil/Node.swift
View File

@@ -84,8 +84,8 @@ public class VariableNode : Node {
}
public class NowNode : Node {
public class func parse(parser:TokenParser, token:Token) -> Node {
return NowNode()
public class func parse(parser:TokenParser, token:Token) -> (node:Node?, error:Error?) {
return (NowNode(), nil)
}
public func render(context: Context) -> (String?, Error?) {
@@ -99,29 +99,41 @@ public class ForNode : Node {
let loopVariable:String
let nodes:[Node]
public class func parse(parser:TokenParser, token:Token) -> Node {
public class func parse(parser:TokenParser, token:Token) -> (node:Node?, error:Error?) {
let components = token.components()
let count = countElements(components)
if count == 4 && components[2] == "in" {
let loopVariable = components[1]
let variable = components[3]
let nodes = parser.parse(until(["endfor", "empty"]))
let (nodes, error) = parser.parse(until(["endfor", "empty"]))
var emptyNodes = [Node]()
if let error = error {
return (nil, error)
}
if let token = parser.nextToken() {
if token.contents == "empty" {
emptyNodes = parser.parse(until(["endfor"]))
let (nodes, error) = parser.parse(until(["endfor"]))
parser.nextToken()
if let error = error {
return (nil, error)
}
if let nodes = nodes {
emptyNodes = nodes
}
}
}
return ForNode(variable: variable, loopVariable: loopVariable, nodes: nodes, emptyNodes:emptyNodes)
return (ForNode(variable: variable, loopVariable: loopVariable, nodes: nodes!, emptyNodes:emptyNodes), nil)
} else {
// TODO error
}
return TextNode(text: "TODO return some error")
return (TextNode(text: "TODO return some error"), nil)
}
public init(variable:String, loopVariable:String, nodes:[Node], emptyNodes:[Node]) {
@@ -160,36 +172,59 @@ public class IfNode : Node {
public let trueNodes:[Node]
public let falseNodes:[Node]
public class func parse(parser:TokenParser, token:Token) -> Node {
public class func parse(parser:TokenParser, token:Token) -> (node:Node?, error:Error?) {
let variable = token.components()[1]
let trueNodes = parser.parse(until(["endif", "else"]))
let (trueNodes, error) = parser.parse(until(["endif", "else"]))
if let error = error {
return (nil, error)
}
var falseNodes = [Node]()
if let token = parser.nextToken() {
if token.contents == "else" {
falseNodes = parser.parse(until(["endif"]))
let (nodes, error) = parser.parse(until(["endif"]))
parser.nextToken()
if let error = error {
return (nil, error)
}
if let nodes = nodes {
falseNodes = nodes
}
}
}
return IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes)
return (IfNode(variable: variable, trueNodes: trueNodes!, falseNodes: falseNodes), nil)
}
public class func parse_ifnot(parser:TokenParser, token:Token) -> Node {
public class func parse_ifnot(parser:TokenParser, token:Token) -> (node:Node?, error:Error?) {
let variable = token.components()[1]
let falseNodes = parser.parse(until(["endif", "else"]))
let (falseNodes, error) = parser.parse(until(["endif", "else"]))
if let error = error {
return (nil, error)
}
var trueNodes = [Node]()
if let token = parser.nextToken() {
if token.contents == "else" {
trueNodes = parser.parse(until(["endif"]))
let (nodes, error) = parser.parse(until(["endif"]))
if let error = error {
return (nil, error)
}
if let nodes = nodes {
trueNodes = nodes
}
parser.nextToken()
}
}
return IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes)
return (IfNode(variable: variable, trueNodes: trueNodes, falseNodes: falseNodes!), nil)
}
public init(variable:String, trueNodes:[Node], falseNodes:[Node]) {