修复在复杂repeated导出时lua和json出现的格式错误

main.go

@@ -43,7 +43,7 @@ func main() {
 
 	// 版本
 	if *paramVersion {
-		fmt.Println("tabtoy 1.1.0")
+		fmt.Println("tabtoy 1.1.1")
 		return
 	}
 

printer/json.go

@@ -16,7 +16,11 @@ type jsonWriter struct {
 
 func (self *jsonWriter) RepeatedMessageBegin(fd *pbmeta.FieldDescriptor, msg *data.DynamicMessage, msgCount int, indent int) {
 
-	self.printer.WriteString(fmt.Sprintf("\"%s\" : [\n", fd.Name()))
+	if indent == 1 {
+		self.printer.WriteString(fmt.Sprintf("\"%s\" : [\n", fd.Name()))
+	} else {
+		self.printer.WriteString(fmt.Sprintf("\"%s\" : [", fd.Name()))
+	}
 
 }
 
@@ -25,7 +29,7 @@ func (self *jsonWriter) WriteMessage(fd *pbmeta.FieldDescriptor, msg *data.Dynam
 
 	pos := self.printer.Len()
 
-	if indent == 1 {
+	if indent == 1 || fd.IsRepeated() {
 		self.printer.WriteString("{")
 
 	} else {

printer/lua.go

@@ -15,13 +15,17 @@ type luaWriter struct {
 
 func (self *luaWriter) RepeatedMessageBegin(fd *pbmeta.FieldDescriptor, msg *data.DynamicMessage, msgCount int, indent int) {
 
-	self.printer.WriteString(fmt.Sprintf("%s = {\n", fd.Name()))
+	if indent == 1 {
+		self.printer.WriteString(fmt.Sprintf("%s = {\n", fd.Name()))
+	} else {
+		self.printer.WriteString(fmt.Sprintf("%s = {", fd.Name()))
+	}
 }
 
 // Value是消息的字段
 func (self *luaWriter) WriteMessage(fd *pbmeta.FieldDescriptor, msg *data.DynamicMessage, indent int) {
 
-	if indent == 1 {
+	if indent == 1 || fd.IsRepeated() {
 		self.printer.WriteString("{")
 
 	} else {

printer/shared.go

@@ -2,7 +2,6 @@ package printer
 
 import (
 	"bytes"
-	"fmt"
 
 	"github.com/davyxu/pbmeta"
 	pbprotos "github.com/davyxu/pbmeta/proto"
@@ -38,7 +37,7 @@ func rawWriteMessage(printer *bytes.Buffer, writer dataWriter, msg *data.Dynamic
 
 		pos := printer.Len()
 
-		if i > 0 {
+		if i > 0 && valueWrite > 0 {
 			writer.WriteFieldSpliter()
 		}
 
@@ -127,6 +126,7 @@ func rawWriteMessage(printer *bytes.Buffer, writer dataWriter, msg *data.Dynamic
 
 				// 单值
 				if value, ok := msg.GetValue(fd); ok {
+
 					writer.WriteValue(fd, value, indent)
 					valueWrite++
 
@@ -147,58 +147,3 @@ func rawWriteMessage(printer *bytes.Buffer, writer dataWriter, msg *data.Dynamic
 	return
 
 }
-
-func getDefaultValueCount(msg *data.DynamicMessage) int {
-
-	var valueCount int
-
-	for i := 0; i < msg.Desc.FieldCount(); i++ {
-		fd := msg.Desc.Field(i)
-		if fd.DefaultValue() != "" {
-			valueCount++
-		}
-	}
-
-	return valueCount
-}
-
-func valueWrapper(fd *pbmeta.FieldDescriptor, value string) string {
-	switch fd.Type() {
-	case pbprotos.FieldDescriptorProto_TYPE_STRING:
-		return strEscape(value)
-	}
-
-	return value
-}
-
-func strEscape(s string) string {
-
-	b := make([]byte, 0)
-
-	var index int
-
-	// 表中直接使用换行会干扰最终合并文件格式, 所以转成\n,由pbt文本解析层转回去
-	for index < len(s) {
-		c := s[index]
-
-		switch c {
-		case '"':
-			b = append(b, '\\')
-			b = append(b, '"')
-		case '\x0A':
-			b = append(b, '\\')
-			b = append(b, 'n')
-		case '\x0D':
-			b = append(b, '\\')
-			b = append(b, 'r')
-		default:
-			b = append(b, c)
-		}
-
-		index++
-
-	}
-
-	return fmt.Sprintf("\"%s\"", string(b))
-
-}

printer/util.go

@@ -0,0 +1,64 @@
+package printer
+
+import (
+	"fmt"
+
+	"github.com/davyxu/pbmeta"
+	pbprotos "github.com/davyxu/pbmeta/proto"
+	"github.com/davyxu/tabtoy/data"
+)
+
+func getDefaultValueCount(msg *data.DynamicMessage) int {
+
+	var valueCount int
+
+	for i := 0; i < msg.Desc.FieldCount(); i++ {
+		fd := msg.Desc.Field(i)
+		if fd.DefaultValue() != "" {
+			valueCount++
+		}
+	}
+
+	return valueCount
+}
+
+func valueWrapper(fd *pbmeta.FieldDescriptor, value string) string {
+	switch fd.Type() {
+	case pbprotos.FieldDescriptorProto_TYPE_STRING:
+		return strEscape(value)
+	}
+
+	return value
+}
+
+func strEscape(s string) string {
+
+	b := make([]byte, 0)
+
+	var index int
+
+	// 表中直接使用换行会干扰最终合并文件格式, 所以转成\n,由pbt文本解析层转回去
+	for index < len(s) {
+		c := s[index]
+
+		switch c {
+		case '"':
+			b = append(b, '\\')
+			b = append(b, '"')
+		case '\x0A':
+			b = append(b, '\\')
+			b = append(b, 'n')
+		case '\x0D':
+			b = append(b, '\\')
+			b = append(b, 'r')
+		default:
+			b = append(b, c)
+		}
+
+		index++
+
+	}
+
+	return fmt.Sprintf("\"%s\"", string(b))
+
+}

test/Actor.json

@@ -1,11 +1,11 @@
 {
 
 "Actor" : [
-{"ID": 100, "Name": "黑猫警长", "Struct" : {"HP": 100, "AttackRate": 0.6}, "BuffID" : [0, 0], "SkillID" : [4, 6, 7]}, 
-{"ID": 101, "Name": "葫芦\n娃", "Struct" : {"HP": 10, "AttackRate": 0.8}, "BuffID" : [3, 1], "Type": 21, "SkillID" : [1]}, 
-{"ID": 102, "Name": "舒\"克\"", "Struct" : {"HP": 10, "AttackRate": 0.7}, "BuffID" : [0, 0], "SkillID" : [0], "StrStruct" : {"HP": 2, "AttackRate": 0.5}}, 
-{"ID": 103, "Name": "贝\n塔", "Struct" : {"HP": 205}, "BuffID" : [0, 0], "SkillID" : [0]}, 
-{"ID": 104, "Name": "邋遢大王", "Struct" : {"HP": 10, "AttackRate": 1}, "BuffID" : [0, 0], "SkillID" : [0]}
+{"ID": 100, "Name": "黑猫警长", "Struct" : {"HP": 100, "AttackRate": 0.6}, "BuffID" : [0, 0], "SkillID" : [4, 6, 7], "StrStruct" : []}, 
+{"ID": 101, "Name": "葫芦\n娃", "Struct" : {"HP": 10, "AttackRate": 0.8}, "BuffID" : [3, 1], "Type": 21, "SkillID" : [1], "StrStruct" : []}, 
+{"ID": 102, "Name": "舒\"克\"", "Struct" : {"HP": 10, "AttackRate": 0.7}, "BuffID" : [0, 0], "SkillID" : [0], "StrStruct" : [{"HP": 2}, {"AttackRate": 0.5}, {"HP": 3, "AttackRate": 1}]}, 
+{"ID": 103, "Name": "贝\n塔", "Struct" : {"HP": 205}, "BuffID" : [0, 0], "SkillID" : [0], "StrStruct" : []}, 
+{"ID": 104, "Name": "邋遢大王", "Struct" : {"HP": 10, "AttackRate": 1}, "BuffID" : [0, 0], "SkillID" : [0], "StrStruct" : []}
 ]
 
 }

test/Actor.lua

@@ -2,11 +2,11 @@
 return {
 
 Actor = {
-{ID = "100", Name = "黑猫警长", Struct = {HP = 100, AttackRate = 0.6}, BuffID = 0, BuffID = 0, SkillID = 4, SkillID = 6, SkillID = 7, StrStruct = {}}, 
-{ID = "101", Name = "葫芦\n娃", Struct = {HP = 10, AttackRate = 0.8}, BuffID = 3, BuffID = 1, Type = "Power", SkillID = 1, StrStruct = {}}, 
-{ID = "102", Name = "舒\"克\"", Struct = {HP = 10, AttackRate = 0.7}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {HP = 2, AttackRate = 0.5}}, 
-{ID = "103", Name = "贝\n塔", Struct = {HP = 205}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {}}, 
-{ID = "104", Name = "邋遢大王", Struct = {HP = 10, AttackRate = 1}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {}}
+{ID = "100", Name = "黑猫警长", Struct = {HP = 100, AttackRate = 0.6}, BuffID = 0, BuffID = 0, SkillID = 4, SkillID = 6, SkillID = 7, StrStruct = {{}, {}, {}}}, 
+{ID = "101", Name = "葫芦\n娃", Struct = {HP = 10, AttackRate = 0.8}, BuffID = 3, BuffID = 1, Type = "Power", SkillID = 1, StrStruct = {{}, {}, {}}}, 
+{ID = "102", Name = "舒\"克\"", Struct = {HP = 10, AttackRate = 0.7}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {{HP = 2}, {AttackRate = 0.5}, {HP = 3, AttackRate = 1}}}, 
+{ID = "103", Name = "贝\n塔", Struct = {HP = 205}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {{}, {}, {}}}, 
+{ID = "104", Name = "邋遢大王", Struct = {HP = 10, AttackRate = 1}, BuffID = 0, BuffID = 0, SkillID = 0, StrStruct = {{}, {}, {}}}
 }
 
 }

test/Actor.pbt

@@ -1,6 +1,6 @@
 # Generated by github.com/davyxu/tabtoy
-Actor {ID: 100 Name: "黑猫警长" Struct {HP: 100 AttackRate: 0.6} BuffID: 0 BuffID: 0 SkillID: 4 SkillID: 6 SkillID: 7} 
-Actor {ID: 101 Name: "葫芦\n娃" Struct {HP: 10 AttackRate: 0.8} BuffID: 3 BuffID: 1 Type: Power SkillID: 1} 
-Actor {ID: 102 Name: "舒\"克\"" Struct {HP: 10 AttackRate: 0.7} BuffID: 0 BuffID: 0 SkillID: 0 StrStruct {HP: 2 AttackRate: 0.5}} 
-Actor {ID: 103 Name: "贝\n塔" Struct {HP: 205} BuffID: 0 BuffID: 0 SkillID: 0} 
-Actor {ID: 104 Name: "邋遢大王" Struct {HP: 10 AttackRate: 1} BuffID: 0 BuffID: 0 SkillID: 0}
+Actor {ID: 100 Name: "黑猫警长" Struct {HP: 100 AttackRate: 0.6} BuffID: 0 BuffID: 0 SkillID: 4 SkillID: 6 SkillID: 7 } 
+Actor {ID: 101 Name: "葫芦\n娃" Struct {HP: 10 AttackRate: 0.8} BuffID: 3 BuffID: 1 Type: Power SkillID: 1 } 
+Actor {ID: 102 Name: "舒\"克\"" Struct {HP: 10 AttackRate: 0.7} BuffID: 0 BuffID: 0 SkillID: 0 StrStruct {HP: 2} StrStruct {AttackRate: 0.5} StrStruct {HP: 3 AttackRate: 1}} 
+Actor {ID: 103 Name: "贝\n塔" Struct {HP: 205} BuffID: 0 BuffID: 0 SkillID: 0 } 
+Actor {ID: 104 Name: "邋遢大王" Struct {HP: 10 AttackRate: 1} BuffID: 0 BuffID: 0 SkillID: 0 }

test/test.proto

@@ -33,7 +33,7 @@ message ActorDefine
 
 	repeated int32 SkillID = 40; // [tabtoy] String2ListSpliter: "," #使用,切割字符串
 
-	Prop StrStruct = 50; // [tabtoy] String2Struct: true
+	repeated Prop StrStruct = 50; // [tabtoy] String2Struct: true
 
 }