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

Correct position of the newly imported tokens

Browse source
This commit is contained in:
Radim Marek 2015-12-06 23:49:21 +01:00
parent d1216f409d
commit d56a9a1c5d
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
caddy/parse/parsing.go
View file

@ -198,12 +198,23 @@ func (p *parser) doImport() error {
return p.Errf("No files matching the import pattern %s", importPattern) return p.Errf("No files matching the import pattern %s", importPattern)
} }
// 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]
tokensAfter := p.tokens[p.cursor+1:]
// cursor was advanced one position to read filename; rewind it
p.cursor--
p.tokens = tokensBefore
for _, importFile := range matches { for _, importFile := range matches {
if err := p.doSingleImport(importFile); err != nil { if err := p.doSingleImport(importFile); err != nil {
return err return err
} }
} }
p.tokens = append(p.tokens, append(tokensAfter)...)
return nil return nil
} }
@ -222,10 +233,7 @@ func (p *parser) doSingleImport(importFile string) error {
// 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. // and insert the imported tokens in their place.
tokensBefore := p.tokens[:p.cursor-1] p.tokens = append(p.tokens, append(importedTokens)...)
tokensAfter := p.tokens[p.cursor+1:]
p.tokens = append(tokensBefore, append(importedTokens, tokensAfter...)...)
p.cursor-- // cursor was advanced one position to read the filename; rewind it
return nil return nil
} }