← Back to branch summary

~hduran-8/+junk/caddy

« back to all changes in this revision

Viewing changes to debian/gocode/src/github.com/mholt/caddy/caddyfile/parse.go

  • Committer: Horacio Durán
  • Date: 2017-01-20 16:21:20 UTC
  • Revision ID: horacio.duran@canonical.com-20170120162120-l82mfqwmsclnk838
Upgrade to 0.9.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gocode/src/github.com/mholt/caddy/caddyfile/parse.go
16
16
// pass in nil instead.
17
17
func Parse(filename string, input io.Reader, validDirectives []string) ([]ServerBlock, error) {
18
18
        p := parser{Dispenser: NewDispenser(filename, input), validDirectives: validDirectives}
19
 
        blocks, err := p.parseAll()
20
 
        return blocks, err
 
19
        return p.parseAll()
21
20
}
22
21
 
23
22
// allTokens lexes the entire input, but does not parse it.
62
61
func (p *parser) parseOne() error {
63
62
        p.block = ServerBlock{Tokens: make(map[string][]Token)}
64
63
 
65
 
        err := p.begin()
66
 
        if err != nil {
67
 
                return err
68
 
        }
69
 
 
70
 
        return nil
 
64
        return p.begin()
71
65
}
72
66
 
73
67
func (p *parser) begin() error {
76
70
        }
77
71
 
78
72
        err := p.addresses()
 
73
 
79
74
        if err != nil {
80
75
                return err
81
76
        }
86
81
                return nil
87
82
        }
88
83
 
89
 
        err = p.blockContents()
90
 
        if err != nil {
91
 
                return err
92
 
        }
93
 
 
94
 
        return nil
 
84
        return p.blockContents()
95
85
}
96
86
 
97
87
func (p *parser) addresses() error {