Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

make sizes and offsets int, not uint64

Browse source 
add Value.Interface, to extract an empty interface
that can be converted to a regular Go value of the
appropriate type, if known.

R=rsc
DELTA=49  (2 added, 0 deleted, 47 changed)
OCL=18526
CL=18526
This commit is contained in:
Rob Pike 2008-11-05 10:17:38 -08:00
parent bdbb958895
commit 554d0aa589
4 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/reflect/value.go
View file

@ -39,7 +39,7 @@ export type Empty interface {} // TODO(r): Delete when no longer needed?
export type Value interface {
Kind() int;
Type() Type;
Unreflect() Empty;
Interface() Empty;
}
// Common fields and functionality for all values
@ -58,7 +58,7 @@ func (c *Common) Type() Type {
return c.typ
}
func (c *Common) Unreflect() Empty {
func (c *Common) Interface() Empty {
return sys.unreflect(*AddrToPtrAddr(c.addr), c.typ.String());
}
@ -517,14 +517,14 @@ export type ArrayValue interface {
Kind() int;
Type() Type;
Open() bool;
Len() uint64;
Elem(i uint64) Value;
Len() int;
Elem(i int) Value;
}
type OpenArrayValueStruct struct {
Common;
elemtype Type;
elemsize uint64;
elemsize int;
}
/*
@ -539,32 +539,32 @@ func (v *OpenArrayValueStruct) Open() bool {
return true
}
func (v *OpenArrayValueStruct) Len() uint64 {
return uint64(*AddrToPtrInt32(v.addr+8));
func (v *OpenArrayValueStruct) Len() int {
return int(*AddrToPtrInt32(v.addr+8));
}
func (v *OpenArrayValueStruct) Elem(i uint64) Value {
func (v *OpenArrayValueStruct) Elem(i int) Value {
base := *AddrToPtrAddr(v.addr);
return NewValueAddr(v.elemtype, base + i * v.elemsize);
return NewValueAddr(v.elemtype, base + Addr(i * v.elemsize));
}
type FixedArrayValueStruct struct {
Common;
elemtype Type;
elemsize uint64;
len uint64;
elemsize int;
len int;
}
func (v *FixedArrayValueStruct) Open() bool {
return false
}
func (v *FixedArrayValueStruct) Len() uint64 {
func (v *FixedArrayValueStruct) Len() int {
return v.len
}
func (v *FixedArrayValueStruct) Elem(i uint64) Value {
return NewValueAddr(v.elemtype, v.addr + i * v.elemsize);
func (v *FixedArrayValueStruct) Elem(i int) Value {
return NewValueAddr(v.elemtype, v.addr + Addr(i * v.elemsize));
return nil
}
@ -658,7 +658,7 @@ func StructCreator(typ Type, addr Addr) Value {
v := &StructValueStruct{ Common{StructKind, typ, addr}, new([]Value, nfield) };
for i := 0; i < nfield; i++ {
name, ftype, str, offset := t.Field(i);
v.field[i] = NewValueAddr(ftype, addr + offset);
v.field[i] = NewValueAddr(ftype, addr + Addr(offset));
}
v.typ = typ;
return v;