Merge pull request #26 from Stebalien/fix/map-type-name

correctly map typegen to cbg in all cases

gen.go

@@ -69,14 +69,17 @@ func typeName(pkg string, t reflect.Type) string {
 	case reflect.Map:
 		return "map[" + typeName(pkg, t.Key()) + "]" + typeName(pkg, t.Elem())
 	default:
-		return strings.TrimPrefix(t.String(), pkg+".")
+		name := t.String()
+		if t.PkgPath() == "github.com/whyrusleeping/cbor-gen" {
+			name = "cbg." + strings.TrimPrefix(name, "typegen.")
+		} else {
+			name = strings.TrimPrefix(name, pkg+".")
+		}
+		return name
 	}
 }
 
 func (f Field) TypeName() string {
-	if f.Type.PkgPath() == "github.com/whyrusleeping/cbor-gen" {
-		return "cbg" + strings.TrimPrefix(typeName(f.Pkg, f.Type), "typegen")
-	}
 	return typeName(f.Pkg, f.Type)
 }