go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-02-19 19:59:49 +02:00
Code Issues Releases Activity

trim end space

Browse Source
This commit is contained in:
Tao Wen 2017-05-05 17:44:09 +08:00
parent a92111261c
commit b893a0359d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
feature_adapter.go
View File

@ -7,6 +7,7 @@ import (
// Unmarshal adapts to json/encoding APIs // Unmarshal adapts to json/encoding APIs
func Unmarshal(data []byte, v interface{}) error { func Unmarshal(data []byte, v interface{}) error {
data = data[:lastNotSpacePos(data)]
iter := ParseBytes(data) iter := ParseBytes(data)
iter.ReadVal(v) iter.ReadVal(v)
if iter.head == iter.tail { if iter.head == iter.tail {
@ -22,6 +23,7 @@ func Unmarshal(data []byte, v interface{}) error {
} }
func UnmarshalAny(data []byte) (Any, error) { func UnmarshalAny(data []byte) (Any, error) {
data = data[:lastNotSpacePos(data)]
iter := ParseBytes(data) iter := ParseBytes(data)
any := iter.ReadAny() any := iter.ReadAny()
if iter.head == iter.tail { if iter.head == iter.tail {
@ -36,8 +38,18 @@ func UnmarshalAny(data []byte) (Any, error) {
return any, iter.Error return any, iter.Error
} }
func lastNotSpacePos(data []byte) int {
for i := len(data) - 1; i >= 0; i-- {
if data[i] != ' ' && data[i] != '\t' && data[i] != '\r' && data[i] != '\n' {
return i + 1
}
}
return 0
}
func UnmarshalFromString(str string, v interface{}) error { func UnmarshalFromString(str string, v interface{}) error {
data := []byte(str) data := []byte(str)
data = data[:lastNotSpacePos(data)]
iter := ParseBytes(data) iter := ParseBytes(data)
iter.ReadVal(v) iter.ReadVal(v)
if iter.head == iter.tail { if iter.head == iter.tail {
@ -54,6 +66,7 @@ func UnmarshalFromString(str string, v interface{}) error {
func UnmarshalAnyFromString(str string) (Any, error) { func UnmarshalAnyFromString(str string) (Any, error) {
data := []byte(str) data := []byte(str)
data = data[:lastNotSpacePos(data)]
iter := ParseBytes(data) iter := ParseBytes(data)
any := iter.ReadAny() any := iter.ReadAny()
if iter.head == iter.tail { if iter.head == iter.tail {

9
jsoniter_demo_test.go
View File

@ -3,13 +3,15 @@ package jsoniter
import ( import (
"fmt" "fmt"
"testing" "testing"
"github.com/json-iterator/go/require"
) )
func Test_bind_api_demo(t *testing.T) { func Test_bind_api_demo(t *testing.T) {
iter := ParseString(`[0,1,2,3]`) should := require.New(t)
val := []int{} val := []int{}
iter.ReadVal(&val) err := UnmarshalFromString(`[0,1,2,3] `, &val)
fmt.Println(val[3]) should.Nil(err)
should.Equal([]int{0, 1, 2, 3}, val)
} }
func Test_iterator_api_demo(t *testing.T) { func Test_iterator_api_demo(t *testing.T) {
@ -20,4 +22,3 @@ func Test_iterator_api_demo(t *testing.T) {
} }
fmt.Println(total) fmt.Println(total)
} }