json.Number default to 0

Author: Tao Wen

generator/encoder.go

@@ -238,7 +238,7 @@ func encodeStructEmbedField(fieldType ast.Expr) {
 		case *ast.SelectorExpr:
 			if y.Sel.Name == "Number" {
 				_l(`  stream.WriteObjectField("Number")`)
-				_l(`  stream.WriteRawOrNull((string)(*val.Number))`)
+				_l(`  stream.WriteRawOrZero((string)(*val.Number))`)
 				_l(`  stream.WriteMore()`)
 			} else if y.Sel.Name == "RawMessage" {
 				reportError(fmt.Errorf("embed json.RawMessage is not supported"))
@@ -260,7 +260,7 @@ func encodeStructEmbedField(fieldType ast.Expr) {
 	case *ast.SelectorExpr:
 		if x.Sel.Name == "Number" {
 			_l(`  stream.WriteObjectField("Number")`)
-			_l(`  stream.WriteRawOrNull((string)(val.Number))`)
+			_l(`  stream.WriteRawOrZero((string)(val.Number))`)
 			_l(`  stream.WriteMore()`)
 		} else if x.Sel.Name == "RawMessage" {
 			reportError(fmt.Errorf("embed json.RawMessage is not supported"))
@@ -304,7 +304,9 @@ func genEncodeStmt(node ast.Node, val string) {
 		genEncodeStmt(x.X, "*"+val)
 		_l("    }")
 	case *ast.SelectorExpr:
-		if x.Sel.Name == "Number" || x.Sel.Name == "RawMessage" {
+		if x.Sel.Name == "Number" {
+			_f("    stream.WriteRawOrZero(string(%s))", val)
+		} else if x.Sel.Name == "RawMessage" {
 			_f("    stream.WriteRawOrNull(string(%s))", val)
 		}
 	default:

stream.go

@@ -64,6 +64,14 @@ func (stream *Stream) WriteRawOrNull(s string) {
 	}
 }
 
+func (stream *Stream) WriteRawOrZero(s string) {
+	if s == "" {
+		stream.WriteRaw("0")
+	} else {
+		stream.WriteRaw(s)
+	}
+}
+
 // WriteNull write null to stream
 func (stream *Stream) WriteNull() {
 	stream.writeFourBytes('n', 'u', 'l', 'l')

value_tests/EmbedNumberStruct_json.go

@@ -35,6 +35,6 @@ func EmbedNumberStruct_json_marshal(stream *jsoniter.Stream, val EmbedNumberStru
 }
 func EmbedNumberStruct_json_marshal_field(stream *jsoniter.Stream, val EmbedNumberStruct) {
   stream.WriteObjectField("Number")
-  stream.WriteRawOrNull((string)(val.Number))
+  stream.WriteRawOrZero((string)(val.Number))
   stream.WriteMore()
 }

value_tests/NamedStruct_json.go

@@ -59,7 +59,7 @@ func NamedStruct_json_marshal_field(stream *jsoniter.Stream, val NamedStruct) {
     if val.Price == nil {
        stream.WriteNull()
     } else {
-    stream.WriteRawOrNull(string(*val.Price))
+    stream.WriteRawOrZero(string(*val.Price))
     }
     stream.WriteMore()
     stream.WriteObjectField(`Raw`)

value_tests/struct_test.go

@@ -77,3 +77,12 @@ func Test_struct8(t *testing.T) {
 	var val2 NamedStruct
 	compareWithStdlib(`{"Raw":["a",1]}`, jsoniter.CreateJsonAdapter(NamedStruct_json{}), &val1, &val2)
 }
+
+func Test_struct9(t *testing.T) {
+	var val1 EmbedNumberStruct
+	jsonAdapter := jsoniter.CreateJsonAdapter(EmbedNumberStruct_json{})
+	bytes, _ := jsonAdapter.MarshalIndent(val1, "", "")
+	if !strings.Contains(string(bytes), `{"Number":0}`) {
+		t.Fatal(string(bytes))
+	}
+}