mirror
/
gjson
mirror of https://github.com/tidwall/gjson.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

key index for ForEach

This commit is contained in:
Josh Baker 2016-12-07 16:37:33 -07:00
parent c1e65a498d
commit 456225d161
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gjson.go
View File

@ -191,6 +191,7 @@ func (t Result) ForEach(iterator func(key, value Result) bool) {
if json[i] != '"' { if json[i] != '"' {
continue continue
} }
s := i
i, str, vesc, ok = parseString(json, i+1) i, str, vesc, ok = parseString(json, i+1)
if !ok { if !ok {
return return
@ -201,6 +202,7 @@ func (t Result) ForEach(iterator func(key, value Result) bool) {
key.Str = str[1 : len(str)-1] key.Str = str[1 : len(str)-1]
} }
key.Raw = str key.Raw = str
key.Index = s
} }
i, value, ok = parseAny(json, i, true) i, value, ok = parseAny(json, i, true)
if !ok { if !ok {
@ -1218,6 +1220,7 @@ func parseArray(c *parseContext, i int, path string) (int, bool) {
c.value.Raw = val c.value.Raw = val
c.value.Type = Number c.value.Type = Number
c.value.Num = float64(h - 1) c.value.Num = float64(h - 1)
c.calcd = true
return i + 1, true return i + 1, true
} }
} }
@ -1238,6 +1241,7 @@ func parseArray(c *parseContext, i int, path string) (int, bool) {
type parseContext struct { type parseContext struct {
json string json string
value Result value Result
calcd bool
} }
// Get searches json for the specified path. // Get searches json for the specified path.
@ -1285,7 +1289,7 @@ func Get(json, path string) Result {
break break
} }
} }
if len(c.value.Raw) > 0 { if len(c.value.Raw) > 0 && !c.calcd {
jhdr := *(*reflect.StringHeader)(unsafe.Pointer(&json)) jhdr := *(*reflect.StringHeader)(unsafe.Pointer(&json))
rhdr := *(*reflect.StringHeader)(unsafe.Pointer(&(c.value.Raw))) rhdr := *(*reflect.StringHeader)(unsafe.Pointer(&(c.value.Raw)))
c.value.Index = int(rhdr.Data - jhdr.Data) c.value.Index = int(rhdr.Data - jhdr.Data)