#61 remove internal buffer from numberLazyAny

feature_any.go

@@ -158,17 +158,9 @@ func (iter *Iterator) readAny() Any {
 
 func (iter *Iterator) readNumberAny(positive bool) Any {
 	iter.startCapture(iter.head - 1)
-	dotFound := iter.skipNumberAndTellDotFoundOrNot()
+	iter.skipNumber()
 	lazyBuf := iter.stopCapture()
-	if dotFound {
-		return &float64LazyAny{baseAny{}, iter.cfg, lazyBuf, nil, 0}
-	} else {
-		if positive {
-			return &uint64LazyAny{baseAny{}, iter.cfg, lazyBuf, nil, 0}
-		} else {
-			return &int64LazyAny{baseAny{}, iter.cfg, lazyBuf, nil, 0}
-		}
-	}
+	return &numberLazyAny{baseAny{}, iter.cfg, lazyBuf, nil}
 }
 
 func (iter *Iterator) readObjectAny() Any {

feature_any_float.go

@@ -1,96 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type float64LazyAny struct {
-	baseAny
-	cfg   *frozenConfig
-	buf   []byte
-	err   error
-	cache float64
-}
-
-func (any *float64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *float64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.cfg.BorrowIterator(any.buf)
-	defer any.cfg.ReturnIterator(iter)
-	any.cache = iter.ReadFloat64()
-	if iter.Error != io.EOF {
-		iter.reportError("floatLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *float64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *float64LazyAny) ToBool() bool {
-	return any.ToFloat64() != 0
-}
-
-func (any *float64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *float64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *float64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return int64(any.cache)
-}
-
-func (any *float64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *float64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *float64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return uint64(any.cache)
-}
-
-func (any *float64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *float64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *float64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *float64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *float64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
 
 type floatAny struct {
 	baseAny

feature_any_int64.go

@@ -1,106 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type int64LazyAny struct {
-	baseAny
-	cfg   *frozenConfig
-	buf   []byte
-	err   error
-	cache int64
-}
-
-func (any *int64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *int64LazyAny) Parse() *Iterator {
-	iter := any.cfg.BorrowIterator(any.buf)
-	defer any.cfg.ReturnIterator(iter)
-	if iter == nil {
-		iter = NewIterator(ConfigDefault)
-	}
-	iter.ResetBytes(any.buf)
-	return iter
-}
-
-func (any *int64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.Parse()
-	any.cache = iter.ReadInt64()
-	if iter.Error != io.EOF {
-		iter.reportError("intLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *int64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *int64LazyAny) ToBool() bool {
-	return any.ToInt64() != 0
-}
-
-func (any *int64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *int64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *int64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *int64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *int64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *int64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return uint64(any.cache)
-}
-
-func (any *int64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *int64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return float64(any.cache)
-}
-
-func (any *int64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *int64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *int64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type int64Any struct {
 	baseAny
 	val int64

feature_any_number.go

@@ -0,0 +1,102 @@
+package jsoniter
+
+import (
+	"unsafe"
+)
+
+type numberLazyAny struct {
+	baseAny
+	cfg   *frozenConfig
+	buf   []byte
+	err   error
+}
+
+func (any *numberLazyAny) ValueType() ValueType {
+	return Number
+}
+
+func (any *numberLazyAny) LastError() error {
+	return any.err
+}
+
+func (any *numberLazyAny) ToBool() bool {
+	return any.ToFloat64() != 0
+}
+
+func (any *numberLazyAny) ToInt() int {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToInt32() int32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToInt64() int64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadInt64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint() uint {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint32() uint32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToUint64() uint64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadUint64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToFloat32() float32 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadFloat32()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToFloat64() float64 {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	val := iter.ReadFloat64()
+	any.err = iter.Error
+	return val
+}
+
+func (any *numberLazyAny) ToString() string {
+	return *(*string)(unsafe.Pointer(&any.buf))
+}
+
+func (any *numberLazyAny) WriteTo(stream *Stream) {
+	stream.Write(any.buf)
+}
+
+func (any *numberLazyAny) GetInterface() interface{} {
+	iter := any.cfg.BorrowIterator(any.buf)
+	defer any.cfg.ReturnIterator(iter)
+	return iter.Read()
+}

feature_any_uint64.go

@@ -1,97 +1,9 @@
 package jsoniter
 
 import (
-	"io"
 	"strconv"
-	"unsafe"
 )
 
-type uint64LazyAny struct {
-	baseAny
-	cfg   *frozenConfig
-	buf   []byte
-	err   error
-	cache uint64
-}
-
-func (any *uint64LazyAny) ValueType() ValueType {
-	return Number
-}
-
-func (any *uint64LazyAny) fillCache() {
-	if any.err != nil {
-		return
-	}
-	iter := any.cfg.BorrowIterator(any.buf)
-	defer any.cfg.ReturnIterator(iter)
-	any.cache = iter.ReadUint64()
-	if iter.Error != io.EOF {
-		iter.reportError("intLazyAny", "there are bytes left")
-	}
-	any.err = iter.Error
-}
-
-func (any *uint64LazyAny) LastError() error {
-	return any.err
-}
-
-func (any *uint64LazyAny) ToBool() bool {
-	return any.ToInt64() != 0
-}
-
-func (any *uint64LazyAny) ToInt() int {
-	any.fillCache()
-	return int(any.cache)
-}
-
-func (any *uint64LazyAny) ToInt32() int32 {
-	any.fillCache()
-	return int32(any.cache)
-}
-
-func (any *uint64LazyAny) ToInt64() int64 {
-	any.fillCache()
-	return int64(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint() uint {
-	any.fillCache()
-	return uint(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint32() uint32 {
-	any.fillCache()
-	return uint32(any.cache)
-}
-
-func (any *uint64LazyAny) ToUint64() uint64 {
-	any.fillCache()
-	return any.cache
-}
-
-func (any *uint64LazyAny) ToFloat32() float32 {
-	any.fillCache()
-	return float32(any.cache)
-}
-
-func (any *uint64LazyAny) ToFloat64() float64 {
-	any.fillCache()
-	return float64(any.cache)
-}
-
-func (any *uint64LazyAny) ToString() string {
-	return *(*string)(unsafe.Pointer(&any.buf))
-}
-
-func (any *uint64LazyAny) WriteTo(stream *Stream) {
-	stream.Write(any.buf)
-}
-
-func (any *uint64LazyAny) GetInterface() interface{} {
-	any.fillCache()
-	return any.cache
-}
-
 type uint64Any struct {
 	baseAny
 	val uint64

feature_iter_skip.go

@@ -225,25 +225,6 @@ func (iter *Iterator) skipNumber() {
 	}
 }
 
-func (iter *Iterator) skipNumberAndTellDotFoundOrNot() bool {
-	dotFound := false
-	for {
-		for i := iter.head; i < iter.tail; i++ {
-			c := iter.buf[i]
-			switch c {
-			case ' ', '\n', '\r', '\t', ',', '}', ']':
-				iter.head = i
-				return dotFound
-			case '.':
-				dotFound = true
-			}
-		}
-		if !iter.loadMore() {
-			return dotFound
-		}
-	}
-}
-
 func (iter *Iterator) skipFixedBytes(n int) {
 	iter.head += n
 	if iter.head >= iter.tail {