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

fixed error on swift 3.1

Browse Source
This commit is contained in:
Ilya Puchka
2017-12-26 15:51:17 +01:00
parent 8d68edd725
commit 7756522317
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Inheritence.swift
View File

@@ -4,8 +4,8 @@ class BlockContext {
// contains mapping of block names to their nodes and templates where they are defined // contains mapping of block names to their nodes and templates where they are defined
var blocks: [String: [(BlockNode, Template?)]] var blocks: [String: [(BlockNode, Template?)]]
init(blocks: [String: (BlockNode, Template?)]) { init(blocks: [String: [(BlockNode, Template?)]]) {
self.blocks = blocks.mapValues({ [$0] }) self.blocks = blocks
} }
func pushBlock(_ block: BlockNode, named blockName: String, definedIn template: Template?) { func pushBlock(_ block: BlockNode, named blockName: String, definedIn template: Template?) {
@@ -95,7 +95,9 @@ class ExtendsNode : NodeType {
blockContext.pushBlock(block, named: name, definedIn: template) blockContext.pushBlock(block, named: name, definedIn: template)
} }
} else { } else {
blockContext = BlockContext(blocks: blocks.mapValues({ ($0, template) })) var blocks = [String: [(BlockNode, Template?)]]()
self.blocks.forEach { blocks[$0.key] = [($0.value, template)] }
blockContext = BlockContext(blocks: blocks)
} }
do { do {