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

Resolve extends and include arguments as variables

Browse Source
This commit is contained in:
Kyle Fuller
2015-11-21 14:42:23 +00:00
parent 48a9a65bd5
commit 3bd3aec296
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Stencil/TemplateLoader/Inheritence.swift
View File

@@ -27,13 +27,13 @@ extension CollectionType {
class ExtendsNode : NodeType {
let templateName: String
let templateName: Variable
let blocks: [String:BlockNode]
class func parse(parser: TokenParser, token: Token) throws -> NodeType {
let bits = token.contents.componentsSeparatedByString("\"")
let bits = token.components()
guard bits.count == 3 else {
guard bits.count == 2 else {
throw TemplateSyntaxError("'extends' takes one argument, the template file to be extended")
}
@@ -51,10 +51,10 @@ class ExtendsNode : NodeType {
return dict
}
return ExtendsNode(templateName: bits[1], blocks: nodes)
return ExtendsNode(templateName: Variable(bits[1]), blocks: nodes)
}
init(templateName: String, blocks: [String:BlockNode]) {
init(templateName: Variable, blocks: [String: BlockNode]) {
self.templateName = templateName
self.blocks = blocks
}
@@ -64,6 +64,10 @@ class ExtendsNode : NodeType {
throw TemplateSyntaxError("Template loader not in context")
}
guard let templateName = try self.templateName.resolve(context) as? String else {
throw TemplateSyntaxError("'\(self.templateName)' could not be resolved as a string")
}
guard let template = loader.loadTemplate(templateName) else {
let paths:String = loader.paths.map { $0.description }.joinWithSeparator(", ")
throw TemplateSyntaxError("'\(templateName)' template not found in \(paths)")