tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error messages containing variable types

Browse source 
value.Type and value.Pos changed to methods, change the users that were
not caught by error checking to use Type() or Pos().

Change-Id: I295a658c007fa2de68c89fb85ee367fbea5ed1aa
This commit is contained in:
Colin Cross 2016-07-15 16:40:37 -07:00
parent f9dbc3becc
commit ba5bf880bf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parser/printer.go
View file

@ -122,7 +122,7 @@ func (p *printer) printExpression(value Expression) {
case *Map: case *Map:
p.printMap(v) p.printMap(v)
default: default:
panic(fmt.Errorf("bad property type: %d", value.Type)) panic(fmt.Errorf("bad property type: %s", value.Type()))
} }
} }

8
unpack.go
View file

@ -279,7 +279,7 @@ func unpackBool(boolValue reflect.Value, property *parser.Property) []error {
if !ok { if !ok {
return []error{ return []error{
fmt.Errorf("%s: can't assign %s value to bool property %q", fmt.Errorf("%s: can't assign %s value to bool property %q",
property.Value.Pos, property.Value.Type, property.Name), property.Value.Pos(), property.Value.Type(), property.Name),
} }
} }
boolValue.SetBool(b.Value) boolValue.SetBool(b.Value)
@ -293,7 +293,7 @@ func unpackString(stringValue reflect.Value,
if !ok { if !ok {
return []error{ return []error{
fmt.Errorf("%s: can't assign %s value to string property %q", fmt.Errorf("%s: can't assign %s value to string property %q",
property.Value.Pos, property.Value.Type, property.Name), property.Value.Pos(), property.Value.Type(), property.Name),
} }
} }
stringValue.SetString(s.Value) stringValue.SetString(s.Value)
@ -306,7 +306,7 @@ func unpackSlice(sliceValue reflect.Value, property *parser.Property) []error {
if !ok { if !ok {
return []error{ return []error{
fmt.Errorf("%s: can't assign %s value to list property %q", fmt.Errorf("%s: can't assign %s value to list property %q",
property.Value.Pos, property.Value.Type, property.Name), property.Value.Pos(), property.Value.Type(), property.Name),
} }
} }
@ -332,7 +332,7 @@ func unpackStruct(namePrefix string, structValue reflect.Value,
if !ok { if !ok {
return []error{ return []error{
fmt.Errorf("%s: can't assign %s value to map property %q", fmt.Errorf("%s: can't assign %s value to map property %q",
property.Value.Pos, property.Value.Type, property.Name), property.Value.Pos(), property.Value.Type(), property.Name),
} }
} }