Refactor more components to use enum

This commit is contained in:
Kyle Fuller
2014-10-26 17:04:04 +00:00
parent 0b1ce61647
commit 5a627999d5
6 changed files with 136 additions and 123 deletions

View File

@@ -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: "")
}
}