Skip to content

Commit

Permalink
feat: smarter array skip
Browse files Browse the repository at this point in the history
  • Loading branch information
tdakkota committed Jan 14, 2022
1 parent 182f376 commit c44f6aa
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
8 changes: 3 additions & 5 deletions dec_arr.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,14 @@ func (d *Decoder) Elem() (ok bool, err error) {
}
}

func skipArr(d *Decoder) error { return d.Skip() }

// Arr decodes array and invokes callback on each array element.
func (d *Decoder) Arr(f func(d *Decoder) error) error {
if f == nil {
f = skipArr
}
if err := d.consume('['); err != nil {
return errors.Wrap(err, "start")
}
if f == nil {
return d.skipArr()
}
if err := d.incDepth(); err != nil {
return errors.Wrap(err, "inc")
}
Expand Down
33 changes: 32 additions & 1 deletion dec_skip.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,38 @@ func (d *Decoder) skipObj() error {
}
}

// skipArr reads JSON array.
//
// Assumes first bracket was consumed.
func (d *Decoder) skipArr() error {
if err := d.incDepth(); err != nil {
return errors.Wrap(err, "inc")
}

c, err := d.more()
if err != nil {
return errors.Wrap(err, "next")
}
if c == ']' {
return d.decDepth()
}
d.unread()
return d.Arr(nil)

for {
if err := d.Skip(); err != nil {
return err
}
c, err := d.more()
if err != nil {
return errors.Wrap(err, "read comma")
}
switch c {
case ',':
continue
case ']':
return d.decDepth()
default:
return badToken(c)
}
}
}

0 comments on commit c44f6aa

Please sign in to comment.