Fix encodesize() for nested byte slices

Author: gz-c

Makefile

@@ -28,6 +28,7 @@ check-generate-unchanged: check-generate-tests-unchanged check-generate-benchmar
 generate-tests: ## Generate encoders and test for test objects
 	go run cmd/skyencoder/skyencoder.go -struct DemoStruct -output-file demo_struct_skyencoder_test.go github.com/skycoin/skyencoder/tests
 	go run cmd/skyencoder/skyencoder.go -struct DemoStructOmitEmpty -output-file demo_struct_omit_empty_skyencoder_test.go github.com/skycoin/skyencoder/tests
+	go run cmd/skyencoder/skyencoder.go -struct DemoStructNestedBytes -output-file demo_struct_nested_bytes_skyencoder_test.go github.com/skycoin/skyencoder/tests
 	go run cmd/skyencoder/skyencoder.go -struct MaxLenStringStruct1 -output-file max_len_string_struct1_skyencoder_test.go github.com/skycoin/skyencoder/tests
 	go run cmd/skyencoder/skyencoder.go -struct MaxLenStringStruct2 -output-file max_len_string_struct2_skyencoder_test.go github.com/skycoin/skyencoder/tests
 	go run cmd/skyencoder/skyencoder.go -struct MaxLenAllStruct1 -output-file max_len_all_struct1_skyencoder_test.go github.com/skycoin/skyencoder/tests
@@ -48,6 +49,8 @@ check-generate-tests-unchanged: ## Check that make generate-tests did not change
 	@if [ "$(shell git diff ./tests/demo_struct_skyencoder_test_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
 	@if [ "$(shell git diff ./tests/demo_struct_omit_empty_skyencoder_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
 	@if [ "$(shell git diff ./tests/demo_struct_omit_empty_skyencoder_test_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
+	@if [ "$(shell git diff ./tests/demo_struct_nested_bytes_skyencoder_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
+	@if [ "$(shell git diff ./tests/demo_struct_nested_bytes_skyencoder_test_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
 	@if [ "$(shell git diff ./tests/max_len_string_struct1_skyencoder_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
 	@if [ "$(shell git diff ./tests/max_len_string_struct1_skyencoder_test_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi
 	@if [ "$(shell git diff ./tests/max_len_string_struct2_skyencoder_test.go | wc -l | tr -d ' ')" != "0" ] ; then echo 'Changes detected after make generate-tests' ; exit 2 ; fi

benchmark/benchmark_struct_skyencoder.go

@@ -213,7 +213,7 @@ func BuildStructEncoder(s *StructInfo, destPackage, fmtFilename string, exported
 		pkgName = s.Package.Name()
 	}
 
-	pkgHeader := fmt.Sprintf("// Code generated by github.com/skycoin/skyencoder. DO NOT EDIT.\npackage %s\n\n", pkgName)
+	pkgHeader := fmt.Sprintf("package %s\n\n// Code generated by github.com/skycoin/skyencoder. DO NOT EDIT.\n\n", pkgName)
 	src = append([]byte(pkgHeader), src...)
 
 	// Format with imports
@@ -497,12 +497,13 @@ func buildCodeSectionEncodeSize(t types.Type, varName, baseCounterName string, d
 		}
 
 		nextCounterName := fmt.Sprintf("%s%d", baseCounterName, depth+1)
-		elemSection, isDynamic, err := buildCodeSectionEncodeSize(elem, "x", baseCounterName, depth+1, nil)
+		xVarName := fmt.Sprintf("x%d", depth+1)
+		elemSection, isDynamic, err := buildCodeSectionEncodeSize(elem, xVarName, baseCounterName, depth+1, nil)
 		if err != nil {
 			return "", false, err
 		}
 
-		return buildEncodeSizeArray(varName, counterName, nextCounterName, "x", elemSection, x.Len(), isDynamic, options), isDynamic, nil
+		return buildEncodeSizeArray(varName, counterName, nextCounterName, xVarName, elemSection, x.Len(), isDynamic, options), isDynamic, nil
 
 	case *types.Slice:
 		elem := x.Elem()
@@ -514,39 +515,41 @@ func buildCodeSectionEncodeSize(t types.Type, varName, baseCounterName string, d
 		}
 
 		if isByte(elem) {
-			return buildEncodeSizeByteSlice(varName, counterName, options), false, nil
+			return buildEncodeSizeByteSlice(varName, counterName, options), true, nil
 		}
 
 		nextCounterName := fmt.Sprintf("%s%d", baseCounterName, depth+1)
-		elemSection, isDynamic, err := buildCodeSectionEncodeSize(elem, "x", baseCounterName, depth+1, nil)
+		xVarName := fmt.Sprintf("x%d", depth+1)
+		elemSection, isDynamic, err := buildCodeSectionEncodeSize(elem, xVarName, baseCounterName, depth+1, nil)
 		if err != nil {
 			return "", false, err
 		}
 
-		return buildEncodeSizeSlice(varName, counterName, nextCounterName, "x", elemSection, isDynamic, options), true, nil
+		return buildEncodeSizeSlice(varName, counterName, nextCounterName, xVarName, elemSection, isDynamic, options), true, nil
 
 	case *types.Map:
 		nextCounterName := fmt.Sprintf("%s%d", baseCounterName, depth+1)
+		kVarName := fmt.Sprintf("k%d", depth+1)
+		vVarName := fmt.Sprintf("v%d", depth+1)
 
-		keySection, isDynamicKey, err := buildCodeSectionEncodeSize(x.Key(), "k", baseCounterName, depth+1, nil)
+		keySection, isDynamicKey, err := buildCodeSectionEncodeSize(x.Key(), kVarName, baseCounterName, depth+1, nil)
 		if err != nil {
 			return "", false, err
 		}
 
-		elemSection, isDynamicElem, err := buildCodeSectionEncodeSize(x.Elem(), "v", baseCounterName, depth+1, nil)
+		elemSection, isDynamicElem, err := buildCodeSectionEncodeSize(x.Elem(), vVarName, baseCounterName, depth+1, nil)
 		if err != nil {
 			return "", false, err
 		}
 
-		return buildEncodeSizeMap(varName, counterName, nextCounterName, "k", "v", keySection, elemSection, isDynamicKey, isDynamicElem, options), true, nil
+		return buildEncodeSizeMap(varName, counterName, nextCounterName, kVarName, vVarName, keySection, elemSection, isDynamicKey, isDynamicElem, options), true, nil
 
 	case *types.Struct:
 		isDynamic := false
 		sections := make([]string, x.NumFields())
 		for i := 0; i < x.NumFields(); i++ {
 			f := x.Field(i)
 
-			// TODO -- confirm that the original encoder ignores unexported fields
 			if !f.Exported() {
 				continue
 			}

benchmark/signed_block_skyencoder.go

@@ -170,13 +170,15 @@ func buildEncodeSizeArray(name, counterName, nextCounterName, elemVarName, elemS
 }
 
 func buildEncodeSizeByteSlice(name, counterName string, options *Options) string {
+	debugPrintf("buildEncodeSizeByteSlice: name=%s counterName=%s\n", name, counterName)
+
 	body := fmt.Sprintf(`
 	// %[1]s
 	%[2]s += 4 + uint64(len(%[1]s))
 	`, name, counterName)
 
 	if options != nil && options.OmitEmpty {
-		return fmt.Sprintf(`
+		body = fmt.Sprintf(`
 		// omitempty
 		if len(%[1]s) != 0 {
 			%[2]s
@@ -190,7 +192,7 @@ func buildEncodeSizeByteSlice(name, counterName string, options *Options) string
 func buildEncodeSizeSlice(name, counterName, nextCounterName, elemVarName, elemSection string, isDynamic bool, options *Options) string {
 	var body string
 
-	debugPrintf("BuildEncodeSizeSlice: counterName=%s\n", counterName)
+	debugPrintf("buildEncodeSizeSlice: name=%s counterName=%s nextCounterName=%s\n", name, counterName, nextCounterName)
 
 	if isDynamic {
 		body = fmt.Sprintf(`
@@ -219,7 +221,7 @@ func buildEncodeSizeSlice(name, counterName, nextCounterName, elemVarName, elemS
 	}
 
 	if options != nil && options.OmitEmpty {
-		return fmt.Sprintf(`
+		body = fmt.Sprintf(`
 		// omitempty
 		if len(%[1]s) != 0 {
 			%[2]s

builder.go

@@ -94,6 +94,16 @@ type DemoStructOmitEmpty struct {
 	OmitEmpty []byte `enc:",omitempty"`
 }
 
+/* nested byte array */
+
+type DemoStructNestedBytes struct {
+	Objects []DemoStructNestedBytesInner
+}
+
+type DemoStructNestedBytesInner struct {
+	Data []byte
+}
+
 /* maxlen tag tests */
 
 type MaxLenStringStruct1 struct {