Skip to content

Commit 5d9e5ec

Browse files
cleanup some paths to clearly show errors
1 parent 0ed68c7 commit 5d9e5ec

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

generator/renderer.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,6 @@ func (r *Renderer) WriteUnmarshalTests(w io.Writer) error {
606606

607607
// valTypeMap maps between ValTypes and go types
608608
var valTypeMap = map[ValType]string{
609-
ValTypeDataArray: "*types.DataArrayType",
610-
ValTypeEnum: "NO-TYPE",
611609
ValTypeBoolean: "types.BoolType",
612610
ValTypeNumber: "types.NumberType",
613611
ValTypeInteger: "types.IntegerType",
@@ -617,7 +615,6 @@ var valTypeMap = map[ValType]string{
617615
ValTypeColorscale: "*types.ColorScale",
618616
ValTypeAngle: "types.NumberType",
619617
ValTypeSubplotID: "types.StringType",
620-
ValTypeFlagList: "NO-TYPE",
621618
ValTypeAny: "interface{}",
622619
ValTypeInfoArray: "interface{}",
623620
}

generator/typefile.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func (file *typeFile) parseAttributes(JSONPath string, typePrefix string, attrs
208208
})
209209

210210
case attr.ValType == ValTypeDataArray:
211-
typeName := valTypeMap[attr.ValType]
211+
typeName := "*types.DataArrayType"
212212

213213
fields = append(fields, structField{
214214
Name: xstrings.ToCamelCase(attr.Name),
@@ -225,7 +225,10 @@ func (file *typeFile) parseAttributes(JSONPath string, typePrefix string, attrs
225225
})
226226

227227
default:
228-
typeName := valTypeMap[attr.ValType]
228+
typeName, ok := valTypeMap[attr.ValType]
229+
if !ok {
230+
panic("valType typeName not defined")
231+
}
229232

230233
// Special case, the attribute color may also be a ColorScale
231234
if attr.ValType == ValTypeColor && attr.Name == "color" && attrs["colorscale"] != nil {

0 commit comments

Comments
 (0)