remove write empty object

Author: Tao Wen

generator/decoder.go

@@ -74,14 +74,15 @@ func decodeAnonymousArray(arrayType *ast.ArrayType) string {
 
 func decodeAnonymousStruct(structType *ast.StructType) string {
 	decoderName := fmt.Sprintf(`%s_struct%d`, prefix, anonymousCounter)
+	typeName := nodeToString(structType)
 	anonymousCounter++
 	oldLines := lines
 	lines = []byte{}
-	_f("func %s_json_unmarshal_field (iter *jsoniter.Iterator, field string, out *%s) bool {", decoderName, nodeToString(structType))
+	_f("func %s_json_unmarshal_field (iter *jsoniter.Iterator, field string, out *%s) bool {", decoderName, typeName)
 	decodeStructField(structType)
 	_l("  return false")
 	_l("}")
-	_f("func %s_json_unmarshal (iter *jsoniter.Iterator, out *%s) {", decoderName, nodeToString(structType))
+	_f("func %s_json_unmarshal (iter *jsoniter.Iterator, out *%s) {", decoderName, typeName)
 	decodeStruct(decoderName, structType)
 	_l("}")
 	anonymousDecoders = append(anonymousDecoders, lines...)

generator/encoder.go

@@ -12,22 +12,42 @@ var anonymousEncoders = []byte{}
 func generateEncoders(typeSpec *ast.TypeSpec) []byte {
 	typeName := typeSpec.Name.Name
 	lines = []byte{}
-	encodeType(typeSpec.Type)
+	encodeType(typeName, typeSpec.Type)
 	mainEncoder := lines
 	lines = []byte{}
+	switch x := typeSpec.Type.(type) {
+	case *ast.StructType:
+		encodeStructField(x)
+	case *ast.StarExpr:
+		encodeOtherField(typeName)
+	case *ast.MapType:
+		encodeOtherField(typeName)
+	case *ast.ArrayType:
+		encodeOtherField(typeName)
+	case *ast.Ident:
+		encodeOtherField(typeName)
+	default:
+		reportError(fmt.Errorf("not supported type: %s", nodeToString(typeSpec)))
+		return nil
+	}
+	fieldsEncoder := lines
+	lines = []byte{}
 	_f("func %s_json_marshal(stream *jsoniter.Stream, val %s) {", prefix, typeName)
 	lines = append(lines, mainEncoder...)
 	_l("}")
+	_f("func %s_json_marshal_field(stream *jsoniter.Stream, val %s) {", prefix, typeName)
+	lines = append(lines, fieldsEncoder...)
+	_l("}")
 	lines = append(lines, anonymousEncoders...)
 	return lines
 }
 
-func encodeType(t ast.Expr) {
+func encodeType(typeName string, t ast.Expr) {
 	switch x := t.(type) {
 	case *ast.ArrayType:
 		encodeArray(x)
 	case *ast.StructType:
-		encodeStruct(x)
+		encodeStruct(typeName, x)
 	case *ast.MapType:
 		encodeMap(x)
 	case *ast.StarExpr:
@@ -74,8 +94,11 @@ func encodeAnonymousStruct(structType *ast.StructType) string {
 	anonymousCounter++
 	oldLines := lines
 	lines = []byte{}
+	_f("func %s_json_marshal_field (stream *jsoniter.Stream, val %s) {", encoderName, typeName)
+	encodeStructField(structType)
+	_l("}")
 	_f("func %s_json_marshal (stream *jsoniter.Stream, val %s) {", encoderName, typeName)
-	encodeStruct(structType)
+	encodeStruct(encoderName, structType)
 	_l("}")
 	anonymousEncoders = append(anonymousEncoders, lines...)
 	lines = oldLines
@@ -114,22 +137,13 @@ func encodeFixedSizeArray(arrayType *ast.ArrayType, length int) {
 }
 
 func encodeMap(mapType *ast.MapType) {
-	_l("  if len(val) == 0 {")
-	_l("    stream.WriteEmptyObject()")
-	_l("  } else {")
-	_l("    isFirst := true")
-	_l("    stream.WriteObjectHead()")
-	_l("    for k, v := range val {")
-	_l("      if isFirst {")
-	_l("        isFirst = false")
-	_l("      } else {")
-	_l("        stream.WriteMore()")
-	_l("      }")
+	_l("  stream.WriteObjectHead()")
+	_l("  for k, v := range val {")
 	switch x := mapType.Key.(type) {
 	case *ast.Ident:
 		switch x.Name {
 		case "string":
-			_l("      stream.WriteObjectField(k)")
+			_l("    stream.WriteObjectField(k)")
 		case "int":
 			fallthrough
 		case "uint":
@@ -159,14 +173,18 @@ func encodeMap(mapType *ast.MapType) {
 		reportError(fmt.Errorf("unsupported map key type: %s", nodeToString(mapType.Key)))
 	}
 	genEncodeStmt(mapType.Value, "v")
-	_l("    }")
-	_l("    stream.WriteObjectTail()")
+	_l("    stream.WriteMore()")
 	_l("  }")
+	_l("  stream.WriteObjectTail()")
 }
 
-func encodeStruct(structType *ast.StructType) {
+func encodeStruct(typeName string, structType *ast.StructType) {
 	_l("    stream.WriteObjectHead()")
-	isFirst := true
+	_f("    %s_json_marshal_field(stream, val)", typeName)
+	_l("    stream.WriteObjectTail()")
+}
+
+func encodeStructField(structType *ast.StructType) {
 	for _, field := range structType.Fields.List {
 		if len(field.Names) == 0 {
 			continue
@@ -192,15 +210,16 @@ func encodeStruct(structType *ast.StructType) {
 		if isNotExported {
 			continue
 		}
-		if isFirst {
-			isFirst = false
-		} else {
-			_l("    stream.WriteMore()")
-		}
 		_f("    stream.WriteObjectField(`%s`)", encodedFieldName)
 		genEncodeStmt(field.Type, fmt.Sprintf("val.%s", fieldName))
+		_l("    stream.WriteMore()")
 	}
-	_l("    stream.WriteObjectTail()")
+}
+
+func encodeOtherField(typeName string) {
+	_f(`    stream.WriteObjectField("%s")`, typeName)
+	_f("    %s_json_marshal(stream, val)", prefix)
+	_l("    stream.WriteMore()")
 }
 
 func genEncodeStmt(node ast.Node, val string) {

stream_object.go

@@ -19,13 +19,19 @@ func (stream *Stream) WriteObjectField(field string) {
 
 // WriteObjectTail write } with possible indention
 func (stream *Stream) WriteObjectTail() {
+	lookBack := len(stream.buf) - 1 - len(stream.Prefix) - len(stream.Indent)*stream.indentCount
+	if stream.withIndent() {
+		lookBack -= 1
+	}
+	lookBackChar := stream.buf[lookBack]
 	stream.indentCount -= 1
-	stream.writeIndent()
-	stream.writeByte('}')
-}
-
-// WriteEmptyObject write {}
-func (stream *Stream) WriteEmptyObject() {
-	stream.writeByte('{')
+	if lookBackChar == ',' {
+		stream.buf = stream.buf[:lookBack]
+	}
+	if lookBackChar == '{' {
+		stream.buf = stream.buf[:lookBack+1]
+	} else {
+		stream.writeIndent()
+	}
 	stream.writeByte('}')
 }

value_tests/AnonymousArray_json.go

@@ -52,9 +52,13 @@ func AnonymousArray_array1_json_unmarshal (iter *jsoniter.Iterator, out *[]strin
 }
 func AnonymousArray_json_marshal(stream *jsoniter.Stream, val AnonymousArray) {
     stream.WriteObjectHead()
+    AnonymousArray_json_marshal_field(stream, val)
+    stream.WriteObjectTail()
+}
+func AnonymousArray_json_marshal_field(stream *jsoniter.Stream, val AnonymousArray) {
     stream.WriteObjectField(`Value`)
     AnonymousArray_array2_json_marshal(stream, val.Value)
-    stream.WriteObjectTail()
+    stream.WriteMore()
 }
 func AnonymousArray_array2_json_marshal (stream *jsoniter.Stream, val []string) {
   if len(val) == 0 {

value_tests/AnonymousMap_json.go

@@ -54,25 +54,20 @@ func AnonymousMap_map1_json_unmarshal (iter *jsoniter.Iterator, out *map[string]
 }
 func AnonymousMap_json_marshal(stream *jsoniter.Stream, val AnonymousMap) {
     stream.WriteObjectHead()
+    AnonymousMap_json_marshal_field(stream, val)
+    stream.WriteObjectTail()
+}
+func AnonymousMap_json_marshal_field(stream *jsoniter.Stream, val AnonymousMap) {
     stream.WriteObjectField(`Value`)
     AnonymousMap_map2_json_marshal(stream, val.Value)
-    stream.WriteObjectTail()
+    stream.WriteMore()
 }
 func AnonymousMap_map2_json_marshal (stream *jsoniter.Stream, val map[string]string) {
-  if len(val) == 0 {
-    stream.WriteEmptyObject()
-  } else {
-    isFirst := true
-    stream.WriteObjectHead()
-    for k, v := range val {
-      if isFirst {
-        isFirst = false
-      } else {
-        stream.WriteMore()
-      }
-      stream.WriteObjectField(k)
+  stream.WriteObjectHead()
+  for k, v := range val {
+    stream.WriteObjectField(k)
     stream.WriteString(v)
-    }
-    stream.WriteObjectTail()
+    stream.WriteMore()
   }
+  stream.WriteObjectTail()
 }

value_tests/AnonymousStruct_json.go

@@ -61,19 +61,30 @@ func AnonymousStruct_struct1_json_unmarshal (iter *jsoniter.Iterator, out *struc
 }
 func AnonymousStruct_json_marshal(stream *jsoniter.Stream, val AnonymousStruct) {
     stream.WriteObjectHead()
+    AnonymousStruct_json_marshal_field(stream, val)
+    stream.WriteObjectTail()
+}
+func AnonymousStruct_json_marshal_field(stream *jsoniter.Stream, val AnonymousStruct) {
     stream.WriteObjectField(`Value`)
     AnonymousStruct_struct2_json_marshal(stream, val.Value)
-    stream.WriteObjectTail()
+    stream.WriteMore()
 }
-func AnonymousStruct_struct2_json_marshal (stream *jsoniter.Stream, val struct {
+func AnonymousStruct_struct2_json_marshal_field (stream *jsoniter.Stream, val struct {
 	Name	string
 	Price	int
 }) {
-    stream.WriteObjectHead()
     stream.WriteObjectField(`Name`)
     stream.WriteString(val.Name)
     stream.WriteMore()
     stream.WriteObjectField(`Price`)
     stream.WriteInt(val.Price)
+    stream.WriteMore()
+}
+func AnonymousStruct_struct2_json_marshal (stream *jsoniter.Stream, val struct {
+	Name	string
+	Price	int
+}) {
+    stream.WriteObjectHead()
+    AnonymousStruct_struct2_json_marshal_field(stream, val)
     stream.WriteObjectTail()
 }

value_tests/DoublePtr_json.go

@@ -42,3 +42,8 @@ func DoublePtr_json_marshal(stream *jsoniter.Stream, val DoublePtr) {
     stream.WriteString(**val)
     }
 }
+func DoublePtr_json_marshal_field(stream *jsoniter.Stream, val DoublePtr) {
+    stream.WriteObjectField("DoublePtr")
+    DoublePtr_json_marshal(stream, val)
+    stream.WriteMore()
+}

value_tests/EmbedNumberStruct_json.go

@@ -30,5 +30,8 @@ func EmbedNumberStruct_json_unmarshal_field(iter *jsoniter.Iterator, field strin
 }
 func EmbedNumberStruct_json_marshal(stream *jsoniter.Stream, val EmbedNumberStruct) {
     stream.WriteObjectHead()
+    EmbedNumberStruct_json_marshal_field(stream, val)
     stream.WriteObjectTail()
 }
+func EmbedNumberStruct_json_marshal_field(stream *jsoniter.Stream, val EmbedNumberStruct) {
+}

value_tests/EmptyStruct_json.go

@@ -29,5 +29,8 @@ func EmptyStruct_json_unmarshal_field(iter *jsoniter.Iterator, field string, out
 }
 func EmptyStruct_json_marshal(stream *jsoniter.Stream, val EmptyStruct) {
     stream.WriteObjectHead()
+    EmptyStruct_json_marshal_field(stream, val)
     stream.WriteObjectTail()
 }
+func EmptyStruct_json_marshal_field(stream *jsoniter.Stream, val EmptyStruct) {
+}

value_tests/IntKeyMap_json.go

@@ -42,22 +42,18 @@ func IntKeyMap_json_unmarshal_field(iter *jsoniter.Iterator, field string, out *
   return false
 }
 func IntKeyMap_json_marshal(stream *jsoniter.Stream, val IntKeyMap) {
-  if len(val) == 0 {
-    stream.WriteEmptyObject()
-  } else {
-    isFirst := true
-    stream.WriteObjectHead()
-    for k, v := range val {
-      if isFirst {
-        isFirst = false
-      } else {
-        stream.WriteMore()
-      }
+  stream.WriteObjectHead()
+  for k, v := range val {
       stream.WriteRaw("\"")
     stream.WriteInt(k)
       stream.WriteRaw("\": ")
     stream.WriteString(v)
-    }
-    stream.WriteObjectTail()
+    stream.WriteMore()
   }
+  stream.WriteObjectTail()
+}
+func IntKeyMap_json_marshal_field(stream *jsoniter.Stream, val IntKeyMap) {
+    stream.WriteObjectField("IntKeyMap")
+    IntKeyMap_json_marshal(stream, val)
+    stream.WriteMore()
 }

value_tests/NamedArray_json.go

@@ -51,3 +51,8 @@ func NamedArray_json_marshal(stream *jsoniter.Stream, val NamedArray) {
     stream.WriteArrayTail()
   }
 }
+func NamedArray_json_marshal_field(stream *jsoniter.Stream, val NamedArray) {
+    stream.WriteObjectField("NamedArray")
+    NamedArray_json_marshal(stream, val)
+    stream.WriteMore()
+}

value_tests/NamedMap_json.go

@@ -42,20 +42,16 @@ func NamedMap_json_unmarshal_field(iter *jsoniter.Iterator, field string, out *N
   return false
 }
 func NamedMap_json_marshal(stream *jsoniter.Stream, val NamedMap) {
-  if len(val) == 0 {
-    stream.WriteEmptyObject()
-  } else {
-    isFirst := true
-    stream.WriteObjectHead()
-    for k, v := range val {
-      if isFirst {
-        isFirst = false
-      } else {
-        stream.WriteMore()
-      }
-      stream.WriteObjectField(k)
+  stream.WriteObjectHead()
+  for k, v := range val {
+    stream.WriteObjectField(k)
     stream.WriteInt(v)
-    }
-    stream.WriteObjectTail()
+    stream.WriteMore()
   }
+  stream.WriteObjectTail()
+}
+func NamedMap_json_marshal_field(stream *jsoniter.Stream, val NamedMap) {
+    stream.WriteObjectField("NamedMap")
+    NamedMap_json_marshal(stream, val)
+    stream.WriteMore()
 }

value_tests/NamedPtr_json.go

@@ -31,3 +31,8 @@ func NamedPtr_json_unmarshal_field(iter *jsoniter.Iterator, field string, out *N
 func NamedPtr_json_marshal(stream *jsoniter.Stream, val NamedPtr) {
     stream.WriteString(*val)
 }
+func NamedPtr_json_marshal_field(stream *jsoniter.Stream, val NamedPtr) {
+    stream.WriteObjectField("NamedPtr")
+    NamedPtr_json_marshal(stream, val)
+    stream.WriteMore()
+}

value_tests/NamedStruct_json.go

@@ -48,6 +48,10 @@ func NamedStruct_ptr1_json_unmarshal (iter *jsoniter.Iterator, out **json.Number
 }
 func NamedStruct_json_marshal(stream *jsoniter.Stream, val NamedStruct) {
     stream.WriteObjectHead()
+    NamedStruct_json_marshal_field(stream, val)
+    stream.WriteObjectTail()
+}
+func NamedStruct_json_marshal_field(stream *jsoniter.Stream, val NamedStruct) {
     stream.WriteObjectField(`Name`)
     stream.WriteString(val.Name)
     stream.WriteMore()
@@ -60,5 +64,5 @@ func NamedStruct_json_marshal(stream *jsoniter.Stream, val NamedStruct) {
     stream.WriteMore()
     stream.WriteObjectField(`Raw`)
     stream.WriteRawOrNull(string(val.Raw))
-    stream.WriteObjectTail()
+    stream.WriteMore()
 }

value_tests/NestedArray_json.go

@@ -65,6 +65,11 @@ func NestedArray_json_marshal(stream *jsoniter.Stream, val NestedArray) {
     stream.WriteArrayTail()
   }
 }
+func NestedArray_json_marshal_field(stream *jsoniter.Stream, val NestedArray) {
+    stream.WriteObjectField("NestedArray")
+    NestedArray_json_marshal(stream, val)
+    stream.WriteMore()
+}
 func NestedArray_array2_json_marshal (stream *jsoniter.Stream, val [2]float64) {
     stream.WriteArrayHead()
     stream.WriteFloat64(val[0])