1
0
mirror of https://github.com/golang/go synced 2024-11-12 00:30:22 -07:00

bug177: anonymous struct fields in reflect

(reported by iant)

R=r
DELTA=50  (32 added, 12 deleted, 6 changed)
OCL=32263
CL=32385
This commit is contained in:
Russ Cox 2009-07-28 17:01:46 -07:00
parent 27b0c351af
commit 123ff2ebb8
4 changed files with 42 additions and 18 deletions

View File

@ -627,7 +627,7 @@ ok:
ot = duint32(s, ot, n);
for(t1=t->type; t1!=T; t1=t1->down) {
// ../../pkg/runtime/type.go:/structField
if(t1->sym) {
if(t1->sym && !t1->embedded) {
ot = dgostringptr(s, ot, t1->sym->name);
if(exportname(t1->sym->name))
ot = dgostringptr(s, ot, nil);

View File

@ -666,7 +666,7 @@ func compileDec(wireId typeId, rt reflect.Type) (engine *decEngine, err os.Error
localField, present := srt.FieldByName(wireField.name);
ovfl := overflow(wireField.name);
// TODO(r): anonymous names
if !present || localField.Anonymous {
if !present {
op, err := decIgnoreOpFor(wireField.id);
if err != nil {
return nil, err

View File

@ -477,7 +477,11 @@ func (t *StructType) Field(i int) (f StructField) {
if p.name != nil {
f.Name = *p.name;
} else {
f.Name = f.Type.Name();
t := f.Type;
if pt, ok := t.(*PtrType); ok {
t = pt.Elem();
}
f.Name = t.Name();
f.Anonymous = true;
}
if p.pkgPath != nil {
@ -487,28 +491,20 @@ func (t *StructType) Field(i int) (f StructField) {
f.Tag = *p.tag;
}
f.Offset = p.offset;
f.Index = i;
return;
}
// FieldByName returns the field with the provided name and a boolean to indicate
// that the field was found..
// that the field was found.
func (t *StructType) FieldByName(name string) (f StructField, present bool) {
for i, p := range t.fields {
if p.name == nil || *p.name != name {
continue;
ff := t.Field(i);
if ff.Name == name {
f = ff;
present = true;
break;
}
f.Name = *p.name;
f.Type = toType(*p.typ);
if p.pkgPath != nil {
f.PkgPath = *p.pkgPath;
}
if p.tag != nil {
f.Tag = *p.tag;
}
f.Offset = p.offset;
f.Index = i;
present = true;
break;
}
return;
}

28
test/fixedbugs/bug177.go Normal file
View File

@ -0,0 +1,28 @@
// $G $D/$F.go && $L $F.$A && ./$A.out
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
import "fmt"
import "reflect"
type S1 struct { i int }
type S2 struct { S1 }
func main() {
typ := reflect.Typeof(S2{}).(*reflect.StructType);
f := typ.Field(0);
if f.Name != "S1" || f.Anonymous != true {
println("BUG: ", f.Name, f.Anonymous);
return;
}
f, ok := typ.FieldByName("S1");
if !ok {
println("BUG: missing S1");
return;
}
if !f.Anonymous {
println("BUG: S1 is not anonymous");
return;
}
}