aboutsummaryrefslogtreecommitdiffstats
path: root/unpack.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-06-09 17:03:57 -0700
committerColin Cross <ccross@android.com>2016-06-14 15:26:49 -0700
commitb3d0b8dab43776e5391eeebe8a9a0de7600ba219 (patch)
treeeb312534bcea19f05d0da2e8fa12b4f9f8e1605a /unpack.go
parentc32c47938f2a04cd62aed8691add85049c6a6625 (diff)
downloadandroid_build_blueprint-b3d0b8dab43776e5391eeebe8a9a0de7600ba219.tar.gz
android_build_blueprint-b3d0b8dab43776e5391eeebe8a9a0de7600ba219.tar.bz2
android_build_blueprint-b3d0b8dab43776e5391eeebe8a9a0de7600ba219.zip
Rename Pos members
Pos is going to be part of the Node interface, rename the Pos member of structs to be more specific. Change-Id: Ibd31119863b96d38bf8dac216e026200a54bbe18
Diffstat (limited to 'unpack.go')
-rw-r--r--unpack.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/unpack.go b/unpack.go
index 62ee061..f7e0a2d 100644
--- a/unpack.go
+++ b/unpack.go
@@ -65,7 +65,7 @@ func unpackProperties(propertyDefs []*parser.Property,
if !packedProperty.unpacked {
err := &Error{
Err: fmt.Errorf("unrecognized property %q", name),
- Pos: packedProperty.property.Pos,
+ Pos: packedProperty.property.ColonPos,
}
errs = append(errs, err)
}
@@ -90,11 +90,11 @@ func buildPropertyMap(namePrefix string, propertyDefs []*parser.Property,
}
errs = append(errs, &Error{
Err: fmt.Errorf("property %q already defined", name),
- Pos: propertyDef.Pos,
+ Pos: propertyDef.ColonPos,
})
errs = append(errs, &Error{
Err: fmt.Errorf("<-- previous definition here"),
- Pos: first.property.Pos,
+ Pos: first.property.ColonPos,
})
if len(errs) >= maxErrors {
return errs
@@ -200,7 +200,7 @@ func unpackStructValue(namePrefix string, structValue reflect.Value,
errs = append(errs,
&Error{
Err: fmt.Errorf("mutated field %s cannot be set in a Blueprint file", propertyName),
- Pos: packedProperty.property.Pos,
+ Pos: packedProperty.property.ColonPos,
})
if len(errs) >= maxErrors {
return errs
@@ -212,7 +212,7 @@ func unpackStructValue(namePrefix string, structValue reflect.Value,
errs = append(errs,
&Error{
Err: fmt.Errorf("filtered field %s cannot be set in a Blueprint file", propertyName),
- Pos: packedProperty.property.Pos,
+ Pos: packedProperty.property.ColonPos,
})
if len(errs) >= maxErrors {
return errs