Skip to content

Commit

Permalink
improve next token performance
Browse files Browse the repository at this point in the history
  • Loading branch information
@zerosnake0
zerosnake0 committed Jan 12, 2020
1 parent 92b0f00 commit 50ae7cb
Show file tree
Hide file tree
Showing 36 changed files with 106 additions and 106 deletions.
16 changes: 8 additions & 8 deletions iterator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (it *Iterator) expectBytes(s string) error {
}

// Read until the first valid token is found, only the whitespaces are consumed
func (it *Iterator) nextToken() (ret byte, vt ValueType, err error) {
func (it *Iterator) nextToken() (ret byte, err error) {
for {
i := it.head
for ; i < it.tail; i++ {
Expand All @@ -190,20 +190,20 @@ func (it *Iterator) nextToken() (ret byte, vt ValueType, err error) {
continue
}
it.head = i
return c, vt, nil
return c, nil
}
// the head and tail will be reset by readMore
it.head = i
if err := it.readMore(); err != nil {
return 0, InvalidValue, err
return 0, err
}
}
}

// Read until the first valid token is found, only the whitespaces are consumed
func (it *Iterator) NextValueType() (vt ValueType, err error) {
_, vt, err = it.nextToken()
return
func (it *Iterator) NextValueType() (ValueType, error) {
v, err := it.nextToken()
return valueTypeMap[v], err
}

func (it *Iterator) Unmarshal(data []byte, obj interface{}) error {
Expand All @@ -212,7 +212,7 @@ func (it *Iterator) Unmarshal(data []byte, obj interface{}) error {
if err != nil {
return err
}
_, _, err = it.nextToken()
_, err = it.nextToken()
if err == nil {
return DataRemainedError
}
Expand All @@ -228,6 +228,6 @@ func (it *Iterator) Valid(data []byte) bool {
if err != nil {
return false
}
_, _, err = it.nextToken()
_, err = it.nextToken()
return err == io.EOF
}
12 changes: 6 additions & 6 deletions iterator_array.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ package jzon
* }
*/
func (it *Iterator) ReadArrayBegin() (ret bool, err error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return false, err
}
if c != '[' {
return false, UnexpectedByteError{got: c, exp: '['}
}
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return false, err
}
Expand All @@ -34,7 +34,7 @@ func (it *Iterator) ReadArrayBegin() (ret bool, err error) {
}

func (it *Iterator) ReadArrayMore() (ret bool, err error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return false, err
}
Expand All @@ -51,15 +51,15 @@ func (it *Iterator) ReadArrayMore() (ret bool, err error) {
}

func (it *Iterator) ReadArrayCB(cb func(*Iterator) error) error {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return err
}
if c != '[' {
return UnexpectedByteError{got: c, exp: '['}
}
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return err
}
Expand All @@ -71,7 +71,7 @@ func (it *Iterator) ReadArrayCB(cb func(*Iterator) error) error {
if err := cb(it); err != nil {
return err
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion iterator_bool.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package jzon

func (it *Iterator) ReadBool() (bool, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return false, err
}
Expand Down
2 changes: 1 addition & 1 deletion iterator_float32.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

func (it *Iterator) ReadFloat32() (float32, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
2 changes: 1 addition & 1 deletion iterator_float64.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (it *Iterator) readFloat64(c byte) (float64, error) {
}

func (it *Iterator) ReadFloat64() (float64, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
4 changes: 2 additions & 2 deletions iterator_int16.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
)

func (it *Iterator) ReadUint16() (uint16, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -94,7 +94,7 @@ func (it *Iterator) readInt16(c byte) (int16, error) {
}

func (it *Iterator) ReadInt16() (int16, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
4 changes: 2 additions & 2 deletions iterator_int32.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
)

func (it *Iterator) ReadUint32() (uint32, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -94,7 +94,7 @@ func (it *Iterator) readInt32(c byte) (int32, error) {
}

func (it *Iterator) ReadInt32() (int32, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
4 changes: 2 additions & 2 deletions iterator_int64.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
)

func (it *Iterator) ReadUint64() (uint64, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -95,7 +95,7 @@ func (it *Iterator) readInt64(c byte) (int64, error) {
}

func (it *Iterator) ReadInt64() (int64, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
4 changes: 2 additions & 2 deletions iterator_int8.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const (
)

func (it *Iterator) ReadUint8() (uint8, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -99,7 +99,7 @@ func (it *Iterator) readInt8(c byte) (int8, error) {
}

func (it *Iterator) ReadInt8() (int8, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return 0, err
}
Expand Down
2 changes: 1 addition & 1 deletion iterator_null.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package jzon

func (it *Iterator) ReadNull() error {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions iterator_number.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ func (it *Iterator) readNumberAsString(c byte) (n string, err error) {
}

func (it *Iterator) ReadNumber() (n Number, err error) {
c, vt, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return
}
if vt != NumberValue {
if valueTypeMap[c] != NumberValue {
err = UnexpectedByteError{got: c}
return
}
Expand Down
18 changes: 9 additions & 9 deletions iterator_object.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ func (it *Iterator) readObjectFieldAsSlice(buf []byte) (
if err != nil {
return
}
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return
}
Expand Down Expand Up @@ -38,7 +38,7 @@ func (it *Iterator) skipObjectField() (bool, error) {
}

func (it *Iterator) ReadObjectBegin() (more bool, field string, err error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return
}
Expand All @@ -47,7 +47,7 @@ func (it *Iterator) ReadObjectBegin() (more bool, field string, err error) {
return
}
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return
}
Expand All @@ -66,7 +66,7 @@ func (it *Iterator) ReadObjectBegin() (more bool, field string, err error) {
}

func (it *Iterator) ReadObjectMore() (more bool, field string, err error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return
}
Expand All @@ -76,7 +76,7 @@ func (it *Iterator) ReadObjectMore() (more bool, field string, err error) {
return
case ',':
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return
}
Expand All @@ -93,15 +93,15 @@ func (it *Iterator) ReadObjectMore() (more bool, field string, err error) {
}

func (it *Iterator) ReadObjectCB(cb func(it *Iterator, field string) error) error {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return err
}
if c != '{' {
return UnexpectedByteError{got: c, exp: '{'}
}
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return err
}
Expand All @@ -121,7 +121,7 @@ func (it *Iterator) ReadObjectCB(cb func(it *Iterator, field string) error) erro
if err := cb(it, field); err != nil {
return err
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return err
}
Expand All @@ -131,7 +131,7 @@ func (it *Iterator) ReadObjectCB(cb func(it *Iterator, field string) error) erro
return nil
case ',':
it.head += 1
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion iterator_raw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jzon

// No copy version
func (it *Iterator) SkipRaw() ([]byte, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return nil, err
}
Expand Down
10 changes: 5 additions & 5 deletions iterator_read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func init() {
}

func (it *Iterator) Read() (interface{}, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return nil, err
}
Expand All @@ -56,7 +56,7 @@ func readWithStack(it *Iterator, top stackElement, s *stack, ns *nodeStack) (
_ interface{}, err error) {
var c byte
for {
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand All @@ -75,7 +75,7 @@ func readWithStack(it *Iterator, top stackElement, s *stack, ns *nodeStack) (
if c != ',' {
return nil, UnexpectedByteError{got: c, exp: ','}
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand All @@ -88,7 +88,7 @@ func readWithStack(it *Iterator, top stackElement, s *stack, ns *nodeStack) (
if err != nil {
return nil, err
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -124,7 +124,7 @@ func readWithStack(it *Iterator, top stackElement, s *stack, ns *nodeStack) (
if c != ',' {
return nil, UnexpectedByteError{got: c, exp: ','}
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions iterator_read_array.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package jzon

func readArrayWithStack(it *Iterator, _ byte) (interface{}, error) {
c, _, err := it.nextToken()
c, err := it.nextToken()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -40,7 +40,7 @@ func readArrayWithStack(it *Iterator, _ byte) (interface{}, error) {
return nil, err
}
topObj = append(topObj, o)
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand All @@ -51,7 +51,7 @@ func readArrayWithStack(it *Iterator, _ byte) (interface{}, error) {
if c != ',' {
return nil, UnexpectedByteError{got: c, exp: ',', exp2: ']'}
}
c, _, err = it.nextToken()
c, err = it.nextToken()
if err != nil {
return nil, err
}
Expand Down
Loading

0 comments on commit 50ae7cb

Please sign in to comment.