From 4c791524fb2a07d0bc182f2390e2f776ba087b26 Mon Sep 17 00:00:00 2001 From: Ichito Nagata Date: Sat, 19 Sep 2020 08:06:17 +0900 Subject: [PATCH] tweak error messages to be more descriptive --- decode.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/decode.go b/decode.go index 8a560ca0..3889b864 100644 --- a/decode.go +++ b/decode.go @@ -276,7 +276,7 @@ func (d *Decoder) getMapNode(node ast.Node) (ast.MapNode, error) { if ok { return mapNode, nil } - return nil, xerrors.Errorf("%s node doesn't MapNode", anchor.Value.Type()) + return nil, xerrors.Errorf("%s node found where MapNode is expected", anchor.Value.Type()) } if alias, ok := node.(*ast.AliasNode); ok { aliasName := alias.Value.GetToken().Value @@ -288,11 +288,11 @@ func (d *Decoder) getMapNode(node ast.Node) (ast.MapNode, error) { if ok { return mapNode, nil } - return nil, xerrors.Errorf("%s node doesn't MapNode", node.Type()) + return nil, xerrors.Errorf("%s node found where MapNode is expected", node.Type()) } mapNode, ok := node.(ast.MapNode) if !ok { - return nil, xerrors.Errorf("%s node doesn't MapNode", node.Type()) + return nil, xerrors.Errorf("%s node found where MapNode is expected", node.Type()) } return mapNode, nil } @@ -306,7 +306,7 @@ func (d *Decoder) getArrayNode(node ast.Node) (ast.ArrayNode, error) { if ok { return arrayNode, nil } - return nil, xerrors.Errorf("%s node doesn't ArrayNode", anchor.Value.Type()) + return nil, xerrors.Errorf("%s node found where ArrayNode is expected", anchor.Value.Type()) } if alias, ok := node.(*ast.AliasNode); ok { aliasName := alias.Value.GetToken().Value @@ -318,11 +318,11 @@ func (d *Decoder) getArrayNode(node ast.Node) (ast.ArrayNode, error) { if ok { return arrayNode, nil } - return nil, xerrors.Errorf("%s node doesn't ArrayNode", node.Type()) + return nil, xerrors.Errorf("%s node found where ArrayNode is expected", node.Type()) } arrayNode, ok := node.(ast.ArrayNode) if !ok { - return nil, xerrors.Errorf("%s node doesn't ArrayNode", node.Type()) + return nil, xerrors.Errorf("%s node found where ArrayNode is expected", node.Type()) } return arrayNode, nil }