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

HBTemplate -> HBMustacheTemplate, escape characters

Browse Source 
Add tests for mustache examples
This commit is contained in:
Adam Fowler
2021-03-12 07:43:09 +00:00
parent 55245e960f
commit 7f61c8dd72
7 changed files with 143 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Sources/HummingbirdMustache/Template+Parser.swift
View File

@@ -1,5 +1,5 @@
extension HBTemplate {
extension HBMustacheTemplate {
static func parse(_ string: String) throws -> [Token] {
var parser = HBParser(string)
return try parse(&parser, sectionName: nil)
@@ -17,14 +17,20 @@ extension HBTemplate {
case "#":
parser.unsafeAdvance()
let name = try parseSectionName(&parser)
if parser.current() == "\n" {
parser.unsafeAdvance()
}
let sectionTokens = try parse(&parser, sectionName: name)
tokens.append(.section(name, HBTemplate(sectionTokens)))
tokens.append(.section(name, HBMustacheTemplate(sectionTokens)))
case "^":
parser.unsafeAdvance()
let name = try parseSectionName(&parser)
if parser.current() == "\n" {
parser.unsafeAdvance()
}
let sectionTokens = try parse(&parser, sectionName: name)
tokens.append(.invertedSection(name, HBTemplate(sectionTokens)))
tokens.append(.invertedSection(name, HBMustacheTemplate(sectionTokens)))
case "/":
parser.unsafeAdvance()
@@ -32,13 +38,16 @@ extension HBTemplate {
guard name == sectionName else {
throw HBMustacheError.sectionCloseNameIncorrect
}
if parser.current() == "\n" {
parser.unsafeAdvance()
}
return tokens
case "{":
parser.unsafeAdvance()
let name = try parseSectionName(&parser)
guard try parser.read("}") else { throw HBMustacheError.unfinishedSectionName }
tokens.append(.variable(name))
tokens.append(.unescapedVariable(name))
case "!":
parser.unsafeAdvance()
@@ -67,5 +76,5 @@ extension HBTemplate {
return text.string
}
private static let sectionNameChars = Set<Unicode.Scalar>("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.")
private static let sectionNameChars = Set<Unicode.Scalar>("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._?")
}