Merge pull request #30 from whyrusleeping/fix/named-string

Fix named string issue
whyrusleeping · Jul 23, 2020 · 6a3894a · 6a3894a
2 parents 13e2891 + ad13f0f
commit 6a3894a
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 27 deletions.
diff --git a/gen.go b/gen.go
@@ -202,7 +202,7 @@ func emitCborMarshalStringField(w io.Writer, f Field) error {
 	}
 
 	{{ MajorType "w" "cbg.MajTextString" (print "len(" .Name ")") }}
-	if _, err := io.WriteString(w, {{ .Name }}); err != nil {
+	if _, err := io.WriteString(w, string({{ .Name }})); err != nil {
 		return err
 	}
 `)

diff --git a/testing/cbor_gen.go b/testing/cbor_gen.go
diff --git a/testing/cbor_map_gen.go b/testing/cbor_map_gen.go
diff --git a/testing/types.go b/testing/types.go
@@ -6,17 +6,19 @@ import (
 
 const Thingc = 3
 
-type NaturalNumber uint64
+type NamedNumber uint64
+type NamedString string
 
 type SignedArray struct {
 	Signed []uint64
 }
 
 type SimpleTypeOne struct {
-	Foo    string
-	Value  uint64
-	Binary []byte
-	Signed int64
+	Foo     string
+	Value   uint64
+	Binary  []byte
+	Signed  int64
+	NString NamedString
 }
 
 type SimpleTypeTwo struct {
@@ -25,9 +27,9 @@ type SimpleTypeTwo struct {
 	SignedOthers []int64
 	Test         [][]byte
 	Dog          string
-	Numbers      []NaturalNumber
+	Numbers      []NamedNumber
 	Pizza        *uint64
-	PointyPizza  *NaturalNumber
+	PointyPizza  *NamedNumber
 	Arrrrrghay   [Thingc]SimpleTypeOne
 }