Skip to content

Commit

Permalink
parser: require \n after parsing integer in kv
Browse files Browse the repository at this point in the history
Fixes #526
  • Loading branch information
pelletier committed Apr 24, 2021
1 parent 931f02a commit 5fef90b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
8 changes: 3 additions & 5 deletions parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ func (p *parser) NextExpression() bool {
return false
}

p.first = false

if p.ref.Valid() {
return true
}

p.first = false
}
}

Expand All @@ -71,8 +71,6 @@ func (p *parser) Error() error {
return p.err
}

var errUnexpectedByte = errors.New("expected newline but got something else")

func (p *parser) parseNewline(b []byte) ([]byte, error) {
if b[0] == '\n' {
return b[1:], nil
Expand All @@ -84,7 +82,7 @@ func (p *parser) parseNewline(b []byte) ([]byte, error) {
return rest, err
}

return nil, fmt.Errorf("parseNewline: %w - %#U", errUnexpectedByte, b[0])
return nil, newDecodeError(b[0:1], "expected newline but got %#U", b[0])
}

func (p *parser) parseExpression(b []byte) (ast.Reference, []byte, error) {
Expand Down
11 changes: 11 additions & 0 deletions unmarshaler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,17 @@ B = "data"`,
}
},
},
{
desc: "no newline (#526)",
input: `a = 1z = 2`,
gen: func() test {
m := map[string]interface{}{}
return test{
target: &m,
err: true,
}
},
},
}

for _, e := range examples {
Expand Down

0 comments on commit 5fef90b

Please sign in to comment.