Commit 24257a1e authored by Russ Cox's avatar Russ Cox

json: clearer Unmarshal doc

R=r
CC=golang-dev
https://golang.org/cl/5056049
parent 7ca40639
...@@ -26,8 +26,16 @@ import ( ...@@ -26,8 +26,16 @@ import (
// Marshal uses, allocating maps, slices, and pointers as necessary, // Marshal uses, allocating maps, slices, and pointers as necessary,
// with the following additional rules: // with the following additional rules:
// //
// To unmarshal JSON into a nil interface value, the // To unmarshal JSON into a pointer, Unmarshal first handles the case of
// type stored in the interface value is one of: // the JSON being the JSON literal null. In that case, Unmarshal sets
// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into
// the value pointed at by the pointer. If the pointer is nil, Unmarshal
// allocates a new value for it to point to.
//
// To unmarshal JSON into an interface value, Unmarshal unmarshals
// the JSON into the concrete value contained in the interface value.
// If the interface value is nil, that is, has no concrete value stored in it,
// Unmarshal stores one of these in the interface value:
// //
// bool, for JSON booleans // bool, for JSON booleans
// float64, for JSON numbers // float64, for JSON numbers
...@@ -36,12 +44,6 @@ import ( ...@@ -36,12 +44,6 @@ import (
// map[string]interface{}, for JSON objects // map[string]interface{}, for JSON objects
// nil for JSON null // nil for JSON null
// //
// To unmarshal JSON into a pointer, Unmarshal first handles the case of
// the JSON being the JSON literal null. In that case, Unmarshal sets
// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into
// the value pointed at by the pointer. If the pointer is nil, Unmarshal
// allocates a new value for it to point to.
//
// If a JSON value is not appropriate for a given target type, // If a JSON value is not appropriate for a given target type,
// or if a JSON number overflows the target type, Unmarshal // or if a JSON number overflows the target type, Unmarshal
// skips that field and completes the unmarshalling as best it can. // skips that field and completes the unmarshalling as best it can.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment