test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-11-30 11:18:02 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

gparser修复

Browse Source
This commit is contained in:
John 2018-01-25 18:57:21 +08:00
parent 5b8d54f15e
commit 32d7d903fa
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
g/encoding/gjson/gjson.go
View File

@ -275,15 +275,13 @@ func (j *Json) Set(pattern string, value interface{}) error {
if value == nil {
goto done
}
s := make([]interface{}, n + 1)
var v interface{}
s := make([]interface{}, len((*pointer).([]interface{})))
copy(s, (*pointer).([]interface{}))
if i == 0 {
*j.p = s
} else {
j.setPointerWithValue(pparent, array[i], s)
}
j.setPointerWithValue(pparent, i, array[i], s)
v = s
pparent = pointer
pointer = &s[n]
pointer = &v
}
}
} else {
@ -300,11 +298,16 @@ func (j *Json) Set(pattern string, value interface{}) error {
goto done
}
var v interface{}
// 判断当前节点应当为map或者数组
if strings.Compare(array[i], "0") == 0 {
if i == length - 1 {
v = []interface{}{value}
} else {
if strings.Compare(array[i + 1], "0") == 0 {
v = make([]interface{}, 0)
} else {
v = make(map[string]interface{})
}
}
} else {
if i == length - 1 {
@ -315,7 +318,7 @@ func (j *Json) Set(pattern string, value interface{}) error {
v = make(map[string]interface{})
}
}
j.setPointerWithValue(pparent, array[i - 1], v)
j.setPointerWithValue(pparent, i, array[i - 1], v)
pparent = pointer
pointer = &v
}
@ -326,7 +329,11 @@ done:
}
// 用于Set方法中，对指针指向的内存地址进行赋值
func (j *Json) setPointerWithValue(pointer *interface{}, key string, value interface{}) {
func (j *Json) setPointerWithValue(pointer *interface{}, index int, key string, value interface{}) {
if index == 0 {
*j.p = value
return
}
switch (*pointer).(type) {
case map[string]interface{}:
(*pointer).(map[string]interface{})[key] = value
@ -341,6 +348,7 @@ func (j *Json) setPointerWithValue(pointer *interface{}, key string, value inter
*pointer = s
}
}
//fmt.Println("end:", *j.p)
}
// 数据结构转换，map参数必须转换为map[string]interface{}，数组参数必须转换为[]interface{}

4
geg/encoding/gparser.go
View File

@ -154,7 +154,7 @@ func makeJson2() {
func makeJson3() {
p := gparser.New([]string{"a"})
p.Set("1.2.3", []int{1,2,3})
p.Set("1.1", 10)
c, _ := p.ToJsonIndent()
fmt.Println(string(c))
}
@ -186,6 +186,6 @@ func convert() {
}
func main() {
makeJson2()
//makeJson2()
makeJson3()
}