Skip to content

修复其他不兼容的类型数组 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elsonwu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

修复其他不兼容的类型数组 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb42f18
move all files on root folder in order to run "go get"
Feb 10, 2014
f898f10
fix can't support map[string]interface{} or []interface{}
Mar 17, 2014
81cf791
merge three switch case into one
Mar 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 phpserialize/common.go → common.go
View file
Open in desktop
File renamed without changes.
0 phpserialize/decoder.go → decoder.go
View file
Open in desktop
File renamed without changes.
0 phpserialize/decoder_test.go → decoder_test.go
View file
Open in desktop
File renamed without changes.
77 changes: 64 additions & 13 deletions phpserialize/encoder.go → encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func encodeValue(buf *bytes.Buffer, value interface{}) (err error) {
buf.WriteRune(TYPE_VALUE_SEPARATOR)
encodeString(buf, t)
buf.WriteRune(VALUES_SEPARATOR)
case map[interface{}]interface{}:
case map[string]interface{}, []interface{}, map[interface{}]interface{}:
buf.WriteString("a")
buf.WriteRune(TYPE_VALUE_SEPARATOR)
err = encodeArrayCore(buf, t)
Expand All @@ -77,26 +77,77 @@ func encodeString(buf *bytes.Buffer, strValue string) {
buf.WriteRune('"')
}

func encodeArrayCore(buf *bytes.Buffer, arrValue map[interface{}]interface{}) (err error) {
valLen := strconv.Itoa(len(arrValue))
buf.WriteString(valLen)
buf.WriteRune(TYPE_VALUE_SEPARATOR)
func rangeArrayCore(buf *bytes.Buffer, arrValue interface{}) (err error) {

buf.WriteRune('{')
for k, v := range arrValue {
if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
if err = encodeValue(buf, intKey); err != nil {
if arrVal, ok := arrValue.([]interface{}); ok {
for k, v := range arrVal {
if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
if err = encodeValue(buf, intKey); err != nil {
break
}
} else {
if err = encodeValue(buf, k); err != nil {
break
}
}
if err = encodeValue(buf, v); err != nil {
break
}
} else {
if err = encodeValue(buf, k); err != nil {
}
} else if arrVal, ok := arrValue.(map[interface{}]interface{}); ok {
for k, v := range arrVal {
if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
if err = encodeValue(buf, intKey); err != nil {
break
}
} else {
if err = encodeValue(buf, k); err != nil {
break
}
}
if err = encodeValue(buf, v); err != nil {
break
}
}
if err = encodeValue(buf, v); err != nil {
break
} else if arrVal, ok := arrValue.(map[string]interface{}); ok {
for k, v := range arrVal {
if intKey, _err := strconv.Atoi(fmt.Sprintf("%v", k)); _err == nil {
if err = encodeValue(buf, intKey); err != nil {
break
}
} else {
if err = encodeValue(buf, k); err != nil {
break
}
}
if err = encodeValue(buf, v); err != nil {
break
}
}
}

return err
}

func encodeArrayCore(buf *bytes.Buffer, arrValue interface{}) (err error) {
valLen := ""
if arr, ok := arrValue.([]interface{}); ok {
valLen = strconv.Itoa(len(arr))
} else if arr, ok := arrValue.(map[interface{}]interface{}); ok {
valLen = strconv.Itoa(len(arr))
} else if arr, ok := arrValue.(map[string]interface{}); ok {
valLen = strconv.Itoa(len(arr))
}

if "" == valLen {
return fmt.Errorf("Unexpected type of array %T", arrValue)
}

buf.WriteString(valLen)
buf.WriteRune(TYPE_VALUE_SEPARATOR)

buf.WriteRune('{')
err = rangeArrayCore(buf, arrValue)
buf.WriteRune('}')
return err
}
0 phpserialize/encoder_test.go → encoder_test.go
View file
Open in desktop
File renamed without changes.