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

[Lexer] Prevent the regex from being greedy

Browse Source
This commit is contained in:
Kyle Fuller
2014-10-25 15:12:20 +01:00
parent 57ae44d167
commit d71e0ec012
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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

9
StencilTests/LexerTests.swift
View File

@@ -46,4 +46,13 @@ class LexerTests: XCTestCase {
XCTAssertEqual(tokens[2], Token.Text(value: ".")) XCTAssertEqual(tokens[2], Token.Text(value: "."))
} }
func testTokenizeTwoVariables() { // Don't be greedy
let lexer = Lexer(templateString:"{{ thing }}{{ name }}")
let tokens = lexer.tokenize()
XCTAssertEqual(tokens.count, 2)
XCTAssertEqual(tokens[0], Token.Variable(value: "thing"))
XCTAssertEqual(tokens[1], Token.Variable(value: "name"))
}
} }