OpenSourceProjects
/
go-toml
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Slight improvement for the document-level error in case no key or table was found.

This commit is contained in:
Maurice Makaay 2019-06-27 22:54:54 +00:00
parent 5782971bde
commit b1484cb690
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parse/document.go
View File

@ -21,8 +21,10 @@ func (t *parser) startDocument(p *parse.API) {
p.Handle(t.startTable) p.Handle(t.startTable)
case p.Peek(detectKey): case p.Peek(detectKey):
p.Handle(t.startKeyValuePair) p.Handle(t.startKeyValuePair)
case p.Accept(a.EndOfFile):
p.Stop()
default: default:
p.ExpectEndOfFile() p.Expected("key/value pair, table or array of tables")
return return
} }
if p.IsStoppedOrInError() { if p.IsStoppedOrInError() {

11
parse/comment_test.go → parse/document_test.go
View File

@ -6,7 +6,7 @@ import (
func TestComment(t *testing.T) { func TestComment(t *testing.T) {
for _, test := range []parseTest{ for _, test := range []parseTest{
{``, `{}`, `unexpected end of file (expected comment) at start of file`}, {``, `{}`, ``},
{`#`, `{}`, ``}, {`#`, `{}`, ``},
{`# `, `{}`, ``}, {`# `, `{}`, ``},
{`# with data`, `{}`, ``}, {`# with data`, `{}`, ``},
@ -20,3 +20,12 @@ func TestComment(t *testing.T) {
testParse(t, p, p.startDocument, test) testParse(t, p, p.startDocument, test)
} }
} }
func TestInvalidDocument(t *testing.T) {
for _, test := range []parseTest{
{`!false!`, `{}`, `unexpected input (expected key/value pair, table or array of tables) at start of file`},
} {
p := newParser()
testParse(t, p, p.startDocument, test)
}
}