Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

import: Fix multiple imports (closes #480)

Browse source
This commit is contained in:
Matthew Holt 2016-01-09 10:52:21 -07:00
parent 9453224639
commit dab679df86
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
caddy/parse/parsing.go
View file

@ -183,63 +183,63 @@ func (p *parser) directives() error {
// other words, call Next() to access the first token that was // other words, call Next() to access the first token that was
// imported. // imported.
func (p *parser) doImport() error { func (p *parser) doImport() error {
// syntax check
if !p.NextArg() { if !p.NextArg() {
return p.ArgErr() return p.ArgErr()
} }
importPattern := p.Val() importPattern := p.Val()
if p.NextArg() { if p.NextArg() {
return p.Err("Import allows only one expression, either file or glob pattern") return p.Err("Import takes only one argument (glob pattern or file)")
} }
// do glob
matches, err := filepath.Glob(importPattern) matches, err := filepath.Glob(importPattern)
if err != nil { if err != nil {
return p.Errf("Failed to use import pattern %s - %s", importPattern, err.Error()) return p.Errf("Failed to use import pattern %s: %v", importPattern, err)
} }
if len(matches) == 0 { if len(matches) == 0 {
return p.Errf("No files matching the import pattern %s", importPattern) return p.Errf("No files matching import pattern %s", importPattern)
} }
// Splice out the import directive and its argument (2 tokens total) // splice out the import directive and its argument (2 tokens total)
// and insert the imported tokens in their place.
tokensBefore := p.tokens[:p.cursor-1] tokensBefore := p.tokens[:p.cursor-1]
tokensAfter := p.tokens[p.cursor+1:] tokensAfter := p.tokens[p.cursor+1:]
// cursor was advanced one position to read filename; rewind it
p.cursor--
p.tokens = tokensBefore
// collect all the imported tokens
var importedTokens []token
for _, importFile := range matches { for _, importFile := range matches {
if err := p.doSingleImport(importFile); err != nil { newTokens, err := p.doSingleImport(importFile)
if err != nil {
return err return err
} }
importedTokens = append(importedTokens, newTokens...)
} }
p.tokens = append(p.tokens, append(tokensAfter)...) // splice the imported tokens in the place of the import statement
// and rewind cursor so Next() will land on first imported token
p.tokens = append(tokensBefore, append(importedTokens, tokensAfter...)...)
p.cursor--
return nil return nil
} }
// doSingleImport lexes the individual files matching the // doSingleImport lexes the individual file at importFile and returns
// globbing pattern from of the import directive. // its tokens or an error, if any.
func (p *parser) doSingleImport(importFile string) error { func (p *parser) doSingleImport(importFile string) ([]token, error) {
file, err := os.Open(importFile) file, err := os.Open(importFile)
if err != nil { if err != nil {
return p.Errf("Could not import %s - %v", importFile, err) return nil, p.Errf("Could not import %s: %v", importFile, err)
} }
defer file.Close() defer file.Close()
importedTokens := allTokens(file) importedTokens := allTokens(file)
// Tack the filename onto these tokens so any errors show the imported file's name // Tack the filename onto these tokens so errors show the imported file's name
filename := filepath.Base(importFile)
for i := 0; i < len(importedTokens); i++ { for i := 0; i < len(importedTokens); i++ {
importedTokens[i].file = filepath.Base(importFile) importedTokens[i].file = filename
} }
// Splice out the import directive and its argument (2 tokens total) return importedTokens, nil
// and insert the imported tokens in their place.
p.tokens = append(p.tokens, append(importedTokens)...)
return nil
} }
// directive collects tokens until the directive's scope // directive collects tokens until the directive's scope