-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from tdakkota/feat/array-iterator
feat: array iterator
- Loading branch information
Showing
4 changed files
with
190 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package jx | ||
|
||
import ( | ||
"github.com/go-faster/errors" | ||
) | ||
|
||
// ArrIter is decoding array iterator. | ||
type ArrIter struct { | ||
d *Decoder | ||
err error | ||
closed bool | ||
comma bool | ||
} | ||
|
||
// ArrIter creates new array iterator. | ||
func (d *Decoder) ArrIter() (ArrIter, error) { | ||
if err := d.consume('['); err != nil { | ||
return ArrIter{}, errors.Wrap(err, "start") | ||
} | ||
if err := d.incDepth(); err != nil { | ||
return ArrIter{}, errors.Wrap(err, "inc") | ||
} | ||
if _, err := d.more(); err != nil { | ||
return ArrIter{}, err | ||
} | ||
d.unread() | ||
return ArrIter{d: d}, nil | ||
} | ||
|
||
// Next consumes element and returns false, if there is no elements anymore. | ||
func (i *ArrIter) Next() bool { | ||
if i.closed { | ||
return false | ||
} | ||
|
||
dec := i.d | ||
c, err := dec.more() | ||
if err != nil { | ||
i.err = err | ||
return false | ||
} | ||
if c == ']' { | ||
i.closed = true | ||
i.err = dec.decDepth() | ||
return false | ||
} | ||
if i.comma { | ||
if c != ',' { | ||
i.err = badToken(c) | ||
return false | ||
} | ||
} else { | ||
dec.unread() | ||
} | ||
i.comma = true | ||
return true | ||
} | ||
|
||
// Err returns the error, if any, that was encountered during iteration. | ||
func (i *ArrIter) Err() error { | ||
return i.err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
package jx | ||
|
||
import ( | ||
"encoding/json" | ||
"io" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestDecoder_ArrIter(t *testing.T) { | ||
testIter := func(d *Decoder) error { | ||
iter, err := d.ArrIter() | ||
if err != nil { | ||
return err | ||
} | ||
for iter.Next() { | ||
if err := d.Skip(); err != nil { | ||
return err | ||
} | ||
} | ||
if iter.Next() { | ||
panic("BUG") | ||
} | ||
return iter.Err() | ||
} | ||
for _, s := range testArrs { | ||
checker := require.Error | ||
if json.Valid([]byte(s)) { | ||
checker = require.NoError | ||
} | ||
|
||
d := DecodeStr(s) | ||
checker(t, testIter(d), s) | ||
} | ||
t.Run("Depth", func(t *testing.T) { | ||
d := DecodeStr(`[`) | ||
// Emulate depth | ||
d.depth = maxDepth | ||
require.ErrorIs(t, testIter(d), errMaxDepth) | ||
}) | ||
t.Run("Empty", func(t *testing.T) { | ||
d := DecodeStr(``) | ||
require.ErrorIs(t, testIter(d), io.ErrUnexpectedEOF) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters