Merge pull request #68 from zhangbozhb/master

bug fix:fix memory leak when parse template
This commit is contained in:
Kyle Fuller
2016-09-04 16:17:28 +02:00
committed by GitHub

View File

@@ -71,13 +71,13 @@ class Scanner {
var index = content.startIndex var index = content.startIndex
while index != content.endIndex { while index != content.endIndex {
let substring = content[index..<content.endIndex] let substring = content.substringFromIndex(index)
if substring.hasPrefix(until) { if substring.hasPrefix(until) {
let result = content[content.startIndex..<index] let result = content.substringToIndex(index)
content = substring content = substring
if returnUntil { if returnUntil {
content = content[until.endIndex..<content.endIndex] content = content.substringFromIndex(until.endIndex)
return result + until return result + until
} }
@@ -97,10 +97,10 @@ class Scanner {
var index = content.startIndex var index = content.startIndex
while index != content.endIndex { while index != content.endIndex {
let substring = content[index..<content.endIndex] let substring = content.substringFromIndex(index)
for string in until { for string in until {
if substring.hasPrefix(string) { if substring.hasPrefix(string) {
let result = content[content.startIndex..<index] let result = content.substringToIndex(index)
content = substring content = substring
return (string, result) return (string, result)
} }