Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-06 22:40:31 -05:00
Code Issues Activity

snippets now

Browse source
This commit is contained in:
Craig Peterson 2017-10-31 23:56:24 -04:00
parent 5c9fc3a473
commit ad2956fd1d
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
caddyfile/parse.go
View file

@ -54,7 +54,7 @@ type parser struct {
block ServerBlock // current server block being parsed block ServerBlock // current server block being parsed
validDirectives []string // a directive must be valid or it's an error validDirectives []string // a directive must be valid or it's an error
eof bool // if we encounter a valid EOF in a hard place eof bool // if we encounter a valid EOF in a hard place
definedMacros map[string][]Token definedSnippets map[string][]Token
} }
func (p *parser) parseAll() ([]ServerBlock, error) { func (p *parser) parseAll() ([]ServerBlock, error) {
@ -96,19 +96,19 @@ func (p *parser) begin() error {
return nil return nil
} }
if ok, name := p.isMacro(); ok { if ok, name := p.isSnippet(); ok {
if p.definedMacros == nil { if p.definedSnippets == nil {
p.definedMacros = map[string][]Token{} p.definedSnippets = map[string][]Token{}
} }
if _, found := p.definedMacros[name]; found { if _, found := p.definedSnippets[name]; found {
return p.Errf("redeclaration of previously declared macro %s", name) return p.Errf("redeclaration of previously declared snippet %s", name)
} }
// consume all tokens til matched close brace // consume all tokens til matched close brace
tokens, err := p.macroTokens() tokens, err := p.snippetTokens()
if err != nil { if err != nil {
return err return err
} }
p.definedMacros[name] = tokens p.definedSnippets[name] = tokens
// empty block keys so we don't save this block as a real server. // empty block keys so we don't save this block as a real server.
p.block.Keys = nil p.block.Keys = nil
return nil return nil
@ -245,9 +245,9 @@ func (p *parser) doImport() error {
tokensAfter := p.tokens[p.cursor+1:] tokensAfter := p.tokens[p.cursor+1:]
var importedTokens []Token var importedTokens []Token
// first check macros. That is a simple, non-recursive replacement // first check snippets. That is a simple, non-recursive replacement
if p.definedMacros != nil && p.definedMacros[importPattern] != nil { if p.definedSnippets != nil && p.definedSnippets[importPattern] != nil {
importedTokens = p.definedMacros[importPattern] importedTokens = p.definedSnippets[importPattern]
} else { } else {
// make path relative to Caddyfile rather than current working directory (issue #867) // make path relative to Caddyfile rather than current working directory (issue #867)
// and then use glob to get list of matching filenames // and then use glob to get list of matching filenames
@ -458,9 +458,9 @@ type ServerBlock struct {
Tokens map[string][]Token Tokens map[string][]Token
} }
func (p *parser) isMacro() (bool, string) { func (p *parser) isSnippet() (bool, string) {
keys := p.block.Keys keys := p.block.Keys
// A macro block is a single key with parens. Nothing else qualifies. // A snippet block is a single key with parens. Nothing else qualifies.
if len(keys) == 1 && strings.HasPrefix(keys[0], "(") && strings.HasSuffix(keys[0], ")") { if len(keys) == 1 && strings.HasPrefix(keys[0], "(") && strings.HasSuffix(keys[0], ")") {
return true, strings.TrimSuffix(keys[0][1:], ")") return true, strings.TrimSuffix(keys[0][1:], ")")
} }
@ -468,9 +468,9 @@ func (p *parser) isMacro() (bool, string) {
} }
// read and store everything in a block for later replay. // read and store everything in a block for later replay.
func (p *parser) macroTokens() ([]Token, error) { func (p *parser) snippetTokens() ([]Token, error) {
// TODO: disallow imports in macros for simplicity at import time // TODO: disallow imports in snippets for simplicity at import time
// macro must have curlies. // snippet must have curlies.
err := p.openCurlyBrace() err := p.openCurlyBrace()
if err != nil { if err != nil {
return nil, err return nil, err

2
caddyfile/parse_test.go
View file

@ -515,7 +515,7 @@ func testParser(input string) parser {
return p return p
} }
func TestMacro(t *testing.T) { func TestSnippets(t *testing.T) {
p := testParser(`(common) { p := testParser(`(common) {
gzip foo gzip foo
errors stderr errors stderr