Introduce variable filters

This commit is contained in:
Kyle Fuller
2015-10-22 09:47:45 -07:00
parent 7d5d226017
commit 16da9ac034
8 changed files with 191 additions and 19 deletions

View File

@@ -10,12 +10,15 @@ public func until(tags:[String])(parser:TokenParser, token:Token) -> Bool {
return false
}
public typealias Filter = Any? -> Any?
/// A class for parsing an array of tokens and converts them into a collection of Node's
public class TokenParser {
public typealias TagParser = (TokenParser, Token) throws -> NodeType
private var tokens:[Token]
private var tags = [String:TagParser]()
private var filters = [String: Filter]()
public init(tokens:[Token]) {
self.tokens = tokens
@@ -26,6 +29,9 @@ public class TokenParser {
registerTag("include", parser: IncludeNode.parse)
registerTag("extends", parser: ExtendsNode.parse)
registerTag("block", parser: BlockNode.parse)
registerFilter("capitalize", filter: capitalise)
registerFilter("uppercase", filter: uppercase)
registerFilter("lowercase", filter: lowercase)
}
/// Registers a new template tag
@@ -40,6 +46,10 @@ public class TokenParser {
})
}
public func registerFilter(name: String, filter: Filter) {
filters[name] = filter
}
/// Parse the given tokens into nodes
public func parse() throws -> [NodeType] {
return try parse(nil)
@@ -54,8 +64,8 @@ public class TokenParser {
switch token {
case .Text(let text):
nodes.append(TextNode(text: text))
case .Variable(let variable):
nodes.append(VariableNode(variable: variable))
case .Variable:
nodes.append(VariableNode(variable: try compileFilter(token.contents)))
case .Block:
let tag = token.components().first
@@ -88,4 +98,16 @@ public class TokenParser {
public func prependToken(token:Token) {
tokens.insert(token, atIndex: 0)
}
public func findFilter(name: String) throws -> Filter {
if let filter = filters[name] {
return filter
}
throw TemplateSyntaxError("Invalid filter '\(name)'")
}
func compileFilter(token: String) throws -> Resolvable {
return try FilterExpression(token: token, parser: self)
}
}