1
0
mirror of https://github.com/json-iterator/go.git synced 2025-07-03 23:30:41 +02:00

rename ValueType, to avoid collision with json.Number

This commit is contained in:
Tao Wen
2017-08-05 07:10:15 +08:00
parent abbd16da6c
commit d249b05a85
26 changed files with 110 additions and 110 deletions

View File

@ -13,7 +13,7 @@ type arrayLazyAny struct {
}
func (any *arrayLazyAny) ValueType() ValueType {
return Array
return ArrayValue
}
func (any *arrayLazyAny) MustBeValid() Any {
@ -117,7 +117,7 @@ func (any *arrayLazyAny) Get(path ...interface{}) Any {
arr := make([]Any, 0)
iter.ReadArrayCB(func(iter *Iterator) bool {
found := iter.readAny().Get(path[1:]...)
if found.ValueType() != Invalid {
if found.ValueType() != InvalidValue {
arr = append(arr, found)
}
return true
@ -162,7 +162,7 @@ func wrapArray(val interface{}) *arrayAny {
}
func (any *arrayAny) ValueType() ValueType {
return Array
return ArrayValue
}
func (any *arrayAny) MustBeValid() Any {
@ -253,7 +253,7 @@ func (any *arrayAny) Get(path ...interface{}) Any {
mappedAll := make([]Any, 0)
for i := 0; i < any.val.Len(); i++ {
mapped := Wrap(any.val.Index(i).Interface()).Get(path[1:]...)
if mapped.ValueType() != Invalid {
if mapped.ValueType() != InvalidValue {
mappedAll = append(mappedAll, mapped)
}
}