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

Support Swift 1.2

Browse Source
This commit is contained in:
Kyle Fuller
2015-06-29 15:21:59 -07:00
parent 0212e8781c
commit 19a7abce4c
23 changed files with 196 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Stencil/Lexer.swift
View File

@@ -31,7 +31,7 @@ public struct Lexer {
var tokens = [Token]()
let range = NSMakeRange(0, countElements(templateString))
let range = NSMakeRange(0, count(templateString))
var lastIndex = 0
let nsTemplateString = templateString as NSString
let options = NSMatchingOptions(0)
@@ -47,7 +47,7 @@ public struct Lexer {
lastIndex = result.range.location + result.range.length
}
if lastIndex < countElements(templateString) {
if lastIndex < count(templateString) {
let substring = (templateString as NSString).substringFromIndex(lastIndex)
tokens.append(Token.Text(value: substring))
}

15
Stencil/Node.swift
View File

@@ -148,9 +148,8 @@ public class ForNode : Node {
public class func parse(parser:TokenParser, token:Token) -> TokenParser.Result {
let components = token.components()
let count = countElements(components)
if count == 4 && components[2] == "in" {
if count(components) == 4 && components[2] == "in" {
let loopVariable = components[1]
let variable = components[3]
@@ -161,7 +160,7 @@ public class ForNode : Node {
case .Success(let nodes):
forNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
if let token = parser.nextToken() {
@@ -170,7 +169,7 @@ public class ForNode : Node {
case .Success(let nodes):
emptyNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
parser.nextToken()
@@ -229,7 +228,7 @@ public class IfNode : Node {
case .Success(let nodes):
trueNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
if let token = parser.nextToken() {
@@ -238,7 +237,7 @@ public class IfNode : Node {
case .Success(let nodes):
falseNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
parser.nextToken()
}
@@ -258,7 +257,7 @@ public class IfNode : Node {
case .Success(let nodes):
falseNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
if let token = parser.nextToken() {
@@ -267,7 +266,7 @@ public class IfNode : Node {
case .Success(let nodes):
trueNodes = nodes
case .Error(let error):
return .Error(error)
return .Error(error: error)
}
parser.nextToken()
}

10
Stencil/Parser.swift
View File

@@ -32,11 +32,11 @@ public class TokenParser {
public init(tokens:[Token]) {
self.tokens = tokens
registerTag("for", ForNode.parse)
registerTag("if", IfNode.parse)
registerTag("ifnot", IfNode.parse_ifnot)
registerTag("now", NowNode.parse)
registerTag("include", IncludeNode.parse)
registerTag("for", parser: ForNode.parse)
registerTag("if", parser: IfNode.parse)
registerTag("ifnot", parser: IfNode.parse_ifnot)
registerTag("now", parser: NowNode.parse)
registerTag("include", parser: IncludeNode.parse)
}
/// Registers a new template tag

2
Stencil/Template.swift
View File

@@ -28,7 +28,7 @@ public class Template {
var error:NSError?
let maybeTemplateString = NSString(contentsOfURL: URL, encoding: NSUTF8StringEncoding, error: &error)
if let templateString = maybeTemplateString {
self.init(templateString:templateString)
self.init(templateString:templateString as String)
} else {
self.init(templateString:"")
return nil

2
Stencil/Variable.swift
View File

@@ -35,7 +35,7 @@ public struct Variable : Equatable {
} else if bit == "last" {
current = array.last
} else if bit == "count" {
current = countElements(array)
current = count(array)
}
} else if let object = current as? NSObject {
current = object.valueForKey(bit)