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

Changes for Xcode 6.1 GM

Browse Source
This commit is contained in:
Marius Rackwitz
2014-10-26 13:12:30 +00:00
parent b35a30c9de
commit 804bc658b2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Stencil/Lexer.swift
View File

@@ -10,7 +10,7 @@ import Foundation
public struct Lexer { public struct Lexer {
public let templateString:String public let templateString:String
let regex = NSRegularExpression(pattern: "(\\{\\{.*?\\}\\}|\\{%.*?%\\}|\\{#.*?#\\})", options: nil, error: nil) let regex = NSRegularExpression(pattern: "(\\{\\{.*?\\}\\}|\\{%.*?%\\}|\\{#.*?#\\})", options: nil, error: nil)!
public init(templateString:String) { public init(templateString:String) {
self.templateString = templateString self.templateString = templateString
@@ -41,7 +41,8 @@ public struct Lexer {
let range = NSMakeRange(0, countElements(templateString)) let range = NSMakeRange(0, countElements(templateString))
var lastIndex = 0 var lastIndex = 0
let nsTemplateString = templateString as NSString let nsTemplateString = templateString as NSString
regex.enumerateMatchesInString(templateString, options: nil, range: range) { (result, flags, b) in let options = NSMatchingOptions(0)
regex.enumerateMatchesInString(templateString, options: options, range: range) { (result, flags, b) in
if result.range.location != lastIndex { if result.range.location != lastIndex {
let previousMatch = nsTemplateString.substringWithRange(NSMakeRange(lastIndex, result.range.location - lastIndex)) let previousMatch = nsTemplateString.substringWithRange(NSMakeRange(lastIndex, result.range.location - lastIndex))
tokens.append(self.createToken(previousMatch)) tokens.append(self.createToken(previousMatch))