diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-02 19:34:41 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-02 19:34:41 +0000 |
| commit | 506cf9aaead4f5519f5549a918d285365b44e989 (patch) | |
| tree | fe0344f264049738dca876a6dd2f69e96621ca17 /libgo/go/json/encode.go | |
| parent | bfa9b58039ceacb1bae803fbbfb049b93540f2a7 (diff) | |
| download | gcc-506cf9aaead4f5519f5549a918d285365b44e989.zip gcc-506cf9aaead4f5519f5549a918d285365b44e989.tar.gz gcc-506cf9aaead4f5519f5549a918d285365b44e989.tar.bz2 | |
libgo: Update to weekly.2011-11-01.
From-SVN: r181938
Diffstat (limited to 'libgo/go/json/encode.go')
| -rw-r--r-- | libgo/go/json/encode.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libgo/go/json/encode.go b/libgo/go/json/encode.go index 46abe436..ba5c15c 100644 --- a/libgo/go/json/encode.go +++ b/libgo/go/json/encode.go @@ -352,7 +352,15 @@ func (e *encodeState) reflectValueQuoted(v reflect.Value, quoted bool) { } e.WriteByte('}') - case reflect.Array, reflect.Slice: + case reflect.Slice: + if v.IsNil() { + e.WriteString("null") + break + } + // Slices can be marshalled as nil, but otherwise are handled + // as arrays. + fallthrough + case reflect.Array: if v.Type() == byteSliceType { e.WriteByte('"') s := v.Interface().([]byte) |