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

Refactor token parser to return enum

Browse Source
This commit is contained in:
Kyle Fuller
2014-10-26 16:14:56 +00:00
parent 6fd3fec141
commit 0b1ce61647
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Stencil/Parser.swift
View File

@@ -13,8 +13,15 @@ public func until(tags:[String])(parser:TokenParser, token:Token) -> Bool {
}
public class TokenParser {
public enum Result {
case Success(node: Node)
case Error(error: Stencil.Error)
}
typealias TagParser = (TokenParser, Token) -> Result
private var tokens:[Token]
private var tags = Dictionary<String, ((TokenParser, Token) -> ((node:Node?, error:Error?)))>()
private var tags = Dictionary<String, TagParser>()
public init(tokens:[Token]) {
self.tokens = tokens
@@ -51,14 +58,11 @@ public class TokenParser {
if let tag = tag {
if let parser = self.tags[tag] {
let (node, error) = parser(self, token)
if let error = error {
return (nil, error)
}
if let node = node {
nodes.append(node)
switch parser(self, token) {
case .Success(let node):
nodes.append(node)
case .Error(let error):
return (nil, error)
}
}
}