Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-07-09 03:04:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

actually return error on redeclaration

Browse Source
This commit is contained in:
Craig Peterson 2017-10-19 10:27:10 -04:00
parent dd4b3efa47
commit 68a495f144
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
caddyfile/parse.go
View File

@ -100,10 +100,9 @@ func (p *parser) begin() error {
if p.definedMacros == nil { if p.definedMacros == nil {
p.definedMacros = map[string][]Token{} p.definedMacros = map[string][]Token{}
} }
if p.definedMacros[name] != nil { if _, found := p.definedMacros[name]; found {
p.Errf("redeclaration of previously declared macro %s", name) return p.Errf("redeclaration of previously declared macro %s", name)
} }
// consume all tokens til matched close brace // consume all tokens til matched close brace
tokens, err := p.macroTokens() tokens, err := p.macroTokens()
if err != nil { if err != nil {