Skip to content

feat: add ParseError #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jensneuse merged 2 commits into from
Dec 10, 2024
Merged

feat: add ParseError #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fd91c2
feat: add ParseError
alepane21 Dec 10, 2024
9cf9bff
Merge branch 'master' into ale/eng-5942-router-produce-an-internal-se…
jensneuse Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@ import (
"github.com/wundergraph/astjson/fastfloat"
)

type ParseError struct {
Err error
}

func (p *ParseError) Error() string {
if p == nil {
return ""
}
return p.Err.Error()
}

func NewParseError(err error) *ParseError {
if err == nil {
return nil
}

return &ParseError{Err: err}
}

// Parser parses JSON.
//
// Parser may be re-used for subsequent parsing.
Expand Down Expand Up @@ -38,11 +57,11 @@ func (p *Parser) Parse(s string) (*Value, error) {

v, tail, err := parseValue(b2s(p.b), p.c, 0)
if err != nil {
return nil, fmt.Errorf("cannot parse JSON: %s; unparsed tail: %q", err, startEndString(tail))
return nil, NewParseError(fmt.Errorf("cannot parse JSON: %s; unparsed tail: %q", err, startEndString(tail)))
}
tail = skipWS(tail)
if len(tail) > 0 {
return nil, fmt.Errorf("unexpected tail: %q", startEndString(tail))
return nil, NewParseError(fmt.Errorf("unexpected tail: %q", startEndString(tail)))
}
return v, nil
}
Expand All @@ -54,11 +73,11 @@ func (p *Parser) ParseWithoutCache(s string) (*Value, error) {

v, tail, err := parseValue(b2s(p.b), p.c, 0)
if err != nil {
return nil, fmt.Errorf("cannot parse JSON: %s; unparsed tail: %q", err, startEndString(tail))
return nil, NewParseError(fmt.Errorf("cannot parse JSON: %s; unparsed tail: %q", err, startEndString(tail)))
}
tail = skipWS(tail)
if len(tail) > 0 {
return nil, fmt.Errorf("unexpected tail: %q", startEndString(tail))
return nil, NewParseError(fmt.Errorf("unexpected tail: %q", startEndString(tail)))
}
return v, nil
}
Expand Down
Loading