this repo has no description
lexgen error handling tweaks (#476)
Working on a separate patch to explicitly handle `ErrUnrecognizedType`
in automod firehose consumer, and reviewed this file.
+6
-6
+2
-2
lex/gen.go
+2
-2
lex/gen.go
···
1290
1290
pf("}\n\n")
1291
1291
}
1292
1292
default:
1293
-
return fmt.Errorf("%s has unrecognized type type %s", name, ts.Type)
1293
+
return fmt.Errorf("%s has unrecognized type: %s", name, ts.Type)
1294
1294
}
1295
1295
1296
1296
return nil
···
1344
1344
1345
1345
return fmt.Errorf("%q unsupported for marshaling", name)
1346
1346
default:
1347
-
return fmt.Errorf("%q has unrecognized type type %s", name, ts.Type)
1347
+
return fmt.Errorf("%q has unrecognized type: %s", name, ts.Type)
1348
1348
}
1349
1349
}
1350
1350
+4
-4
lex/util/decoder.go
+4
-4
lex/util/decoder.go
···
34
34
func NewFromType(typ string) (interface{}, error) {
35
35
t, ok := lexTypesMap[typ]
36
36
if !ok {
37
-
return nil, fmt.Errorf("unknown type: %q", typ)
37
+
return nil, fmt.Errorf("%w: %q", ErrUnrecognizedType, typ)
38
38
}
39
39
v := reflect.New(t)
40
40
return v.Interface(), nil
···
48
48
49
49
t, ok := lexTypesMap[tstr]
50
50
if !ok {
51
-
return nil, fmt.Errorf("unrecognized type: %q", tstr)
51
+
return nil, fmt.Errorf("%w: %q", ErrUnrecognizedType, tstr)
52
52
}
53
53
54
54
val := reflect.New(t)
···
66
66
cbg.CBORMarshaler
67
67
}
68
68
69
-
var ErrUnrecognizedType = fmt.Errorf("unrecognized type")
69
+
var ErrUnrecognizedType = fmt.Errorf("unrecognized lexicon type")
70
70
71
71
func CborDecodeValue(b []byte) (CBOR, error) {
72
72
tstr, err := CborTypeExtract(b)
···
76
76
77
77
t, ok := lexTypesMap[tstr]
78
78
if !ok {
79
-
return nil, fmt.Errorf("handling %q: %w", tstr, ErrUnrecognizedType)
79
+
return nil, fmt.Errorf("%w: %q", ErrUnrecognizedType, tstr)
80
80
}
81
81
82
82
val := reflect.New(t)