diff options
Diffstat (limited to 'vendor/github.com/go-ini/ini/parser.go')
-rw-r--r-- | vendor/github.com/go-ini/ini/parser.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vendor/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go index b0aabe3..673ef80 100644 --- a/vendor/github.com/go-ini/ini/parser.go +++ b/vendor/github.com/go-ini/ini/parser.go | |||
@@ -318,11 +318,14 @@ func (f *File) parse(reader io.Reader) (err error) { | |||
318 | if err != nil { | 318 | if err != nil { |
319 | // Treat as boolean key when desired, and whole line is key name. | 319 | // Treat as boolean key when desired, and whole line is key name. |
320 | if IsErrDelimiterNotFound(err) && f.options.AllowBooleanKeys { | 320 | if IsErrDelimiterNotFound(err) && f.options.AllowBooleanKeys { |
321 | key, err := section.NewKey(string(line), "true") | 321 | kname, err := p.readValue(line, f.options.IgnoreContinuation) |
322 | if err != nil { | ||
323 | return err | ||
324 | } | ||
325 | key, err := section.NewBooleanKey(kname) | ||
322 | if err != nil { | 326 | if err != nil { |
323 | return err | 327 | return err |
324 | } | 328 | } |
325 | key.isBooleanType = true | ||
326 | key.Comment = strings.TrimSpace(p.comment.String()) | 329 | key.Comment = strings.TrimSpace(p.comment.String()) |
327 | p.comment.Reset() | 330 | p.comment.Reset() |
328 | continue | 331 | continue |
@@ -338,17 +341,16 @@ func (f *File) parse(reader io.Reader) (err error) { | |||
338 | p.count++ | 341 | p.count++ |
339 | } | 342 | } |
340 | 343 | ||
341 | key, err := section.NewKey(kname, "") | 344 | value, err := p.readValue(line[offset:], f.options.IgnoreContinuation) |
342 | if err != nil { | 345 | if err != nil { |
343 | return err | 346 | return err |
344 | } | 347 | } |
345 | key.isAutoIncrement = isAutoIncr | ||
346 | 348 | ||
347 | value, err := p.readValue(line[offset:], f.options.IgnoreContinuation) | 349 | key, err := section.NewKey(kname, value) |
348 | if err != nil { | 350 | if err != nil { |
349 | return err | 351 | return err |
350 | } | 352 | } |
351 | key.SetValue(value) | 353 | key.isAutoIncrement = isAutoIncr |
352 | key.Comment = strings.TrimSpace(p.comment.String()) | 354 | key.Comment = strings.TrimSpace(p.comment.String()) |
353 | p.comment.Reset() | 355 | p.comment.Reset() |
354 | } | 356 | } |