mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
gofmt-ify reflect
- the single line structs can be fixed in another round R=rsc http://go/go-review/1016052
This commit is contained in:
Robert Griesemer
parent
666afa1c02
commit
77334b988c
4 changed files with 412 additions and 236 deletions
|
|
@ -13,7 +13,12 @@ import (
|
|||
)
|
||||
|
||||
type integer int
|
||||
type T struct { a int; b float64; c string; d *int }
|
||||
type T struct {
|
||||
a int;
|
||||
b float64;
|
||||
c string;
|
||||
d *int;
|
||||
}
|
||||
|
||||
type pair struct {
|
||||
i interface{};
|
||||
|
|
@ -21,7 +26,7 @@ type pair struct {
|
|||
}
|
||||
|
||||
func isDigit(c uint8) bool {
|
||||
return '0' <= c && c <= '9'
|
||||
return '0' <= c && c <= '9';
|
||||
}
|
||||
|
||||
func assert(t *testing.T, s, want string) {
|
||||
|
|
@ -35,38 +40,141 @@ func typestring(i interface{}) string {
|
|||
}
|
||||
|
||||
var typeTests = []pair{
|
||||
pair { struct { x int }{}, "int" },
|
||||
pair { struct { x int8 }{}, "int8" },
|
||||
pair { struct { x int16 }{}, "int16" },
|
||||
pair { struct { x int32 }{}, "int32" },
|
||||
pair { struct { x int64 }{}, "int64" },
|
||||
pair { struct { x uint }{}, "uint" },
|
||||
pair { struct { x uint8 }{}, "uint8" },
|
||||
pair { struct { x uint16 }{}, "uint16" },
|
||||
pair { struct { x uint32 }{}, "uint32" },
|
||||
pair { struct { x uint64 }{}, "uint64" },
|
||||
pair { struct { x float }{}, "float" },
|
||||
pair { struct { x float32 }{}, "float32" },
|
||||
pair { struct { x float64 }{}, "float64" },
|
||||
pair { struct { x int8 }{}, "int8" },
|
||||
pair { struct { x (**int8) }{}, "**int8" },
|
||||
pair { struct { x (**integer) }{}, "**reflect_test.integer" },
|
||||
pair { struct { x ([32]int32) }{}, "[32]int32" },
|
||||
pair { struct { x ([]int8) }{}, "[]int8" },
|
||||
pair { struct { x (map[string]int32) }{}, "map[string] int32" },
|
||||
pair { struct { x (chan<-string) }{}, "chan<- string" },
|
||||
pair { struct { x struct {c chan *int32; d float32} }{}, "struct { c chan *int32; d float32 }" },
|
||||
pair { struct { x (func(a int8, b int32)) }{}, "func(int8, int32)" },
|
||||
pair { struct { x struct {c func(chan *integer, *int8)} }{}, "struct { c func(chan *reflect_test.integer, *int8) }" },
|
||||
pair { struct { x struct {a int8; b int32} }{}, "struct { a int8; b int32 }" },
|
||||
pair { struct { x struct {a int8; b int8; c int32} }{}, "struct { a int8; b int8; c int32 }" },
|
||||
pair { struct { x struct {a int8; b int8; c int8; d int32} }{}, "struct { a int8; b int8; c int8; d int32 }" },
|
||||
pair { struct { x struct {a int8; b int8; c int8; d int8; e int32} }{}, "struct { a int8; b int8; c int8; d int8; e int32 }" },
|
||||
pair { struct { x struct {a int8; b int8; c int8; d int8; e int8; f int32} }{}, "struct { a int8; b int8; c int8; d int8; e int8; f int32 }" },
|
||||
pair { struct { x struct {a int8 "hi there"; } }{}, `struct { a int8 "hi there" }` },
|
||||
pair { struct { x struct {a int8 "hi \x00there\t\n\"\\"; } }{}, `struct { a int8 "hi \x00there\t\n\"\\" }` },
|
||||
pair { struct { x struct {f func(args ...)} }{}, "struct { f func(...) }" },
|
||||
pair { struct { x (interface { a(func(func(int)(int))(func(func(int))(int))); b() }) }{}, "interface { a (func(func(int) (int)) (func(func(int)) (int))); b () }" },
|
||||
pair{struct {
|
||||
x int;
|
||||
}{}, "int"},
|
||||
pair{struct {
|
||||
x int8;
|
||||
}{}, "int8"},
|
||||
pair{struct {
|
||||
x int16;
|
||||
}{}, "int16"},
|
||||
pair{struct {
|
||||
x int32;
|
||||
}{}, "int32"},
|
||||
pair{struct {
|
||||
x int64;
|
||||
}{}, "int64"},
|
||||
pair{struct {
|
||||
x uint;
|
||||
}{}, "uint"},
|
||||
pair{struct {
|
||||
x uint8;
|
||||
}{}, "uint8"},
|
||||
pair{struct {
|
||||
x uint16;
|
||||
}{}, "uint16"},
|
||||
pair{struct {
|
||||
x uint32;
|
||||
}{}, "uint32"},
|
||||
pair{struct {
|
||||
x uint64;
|
||||
}{}, "uint64"},
|
||||
pair{struct {
|
||||
x float;
|
||||
}{}, "float"},
|
||||
pair{struct {
|
||||
x float32;
|
||||
}{}, "float32"},
|
||||
pair{struct {
|
||||
x float64;
|
||||
}{}, "float64"},
|
||||
pair{struct {
|
||||
x int8;
|
||||
}{}, "int8"},
|
||||
pair{struct {
|
||||
x (**int8);
|
||||
}{}, "**int8"},
|
||||
pair{struct {
|
||||
x (**integer);
|
||||
}{}, "**reflect_test.integer"},
|
||||
pair{struct {
|
||||
x ([32]int32);
|
||||
}{}, "[32]int32"},
|
||||
pair{struct {
|
||||
x ([]int8);
|
||||
}{}, "[]int8"},
|
||||
pair{struct {
|
||||
x (map[string]int32);
|
||||
}{}, "map[string] int32"},
|
||||
pair{struct {
|
||||
x (chan<- string);
|
||||
}{}, "chan<- string"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
c chan *int32;
|
||||
d float32;
|
||||
};
|
||||
}{}, "struct { c chan *int32; d float32 }"},
|
||||
pair{struct {
|
||||
x (func(a int8, b int32));
|
||||
}{}, "func(int8, int32)"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
c func(chan *integer, *int8);
|
||||
};
|
||||
}{}, "struct { c func(chan *reflect_test.integer, *int8) }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8;
|
||||
b int32;
|
||||
};
|
||||
}{}, "struct { a int8; b int32 }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8;
|
||||
b int8;
|
||||
c int32;
|
||||
};
|
||||
}{}, "struct { a int8; b int8; c int32 }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8;
|
||||
b int8;
|
||||
c int8;
|
||||
d int32;
|
||||
};
|
||||
}{}, "struct { a int8; b int8; c int8; d int32 }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8;
|
||||
b int8;
|
||||
c int8;
|
||||
d int8;
|
||||
e int32;
|
||||
};
|
||||
}{}, "struct { a int8; b int8; c int8; d int8; e int32 }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8;
|
||||
b int8;
|
||||
c int8;
|
||||
d int8;
|
||||
e int8;
|
||||
f int32;
|
||||
};
|
||||
}{}, "struct { a int8; b int8; c int8; d int8; e int8; f int32 }"},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8 "hi there";
|
||||
};
|
||||
}{}, `struct { a int8 "hi there" }`},
|
||||
pair{struct {
|
||||
x struct {
|
||||
a int8 "hi \x00there\t\n\"\\";
|
||||
};
|
||||
}{}, `struct { a int8 "hi \x00there\t\n\"\\" }`},
|
||||
pair{struct {
|
||||
x struct {
|
||||
f func(args ...);
|
||||
};
|
||||
}{}, "struct { f func(...) }"},
|
||||
pair{struct {
|
||||
x (interface {
|
||||
a(func(func(int) int) (func(func(int)) int));
|
||||
b();
|
||||
});
|
||||
}{}, "interface { a (func(func(int) (int)) (func(func(int)) (int))); b () }"},
|
||||
}
|
||||
|
||||
var valueTests = []pair{
|
||||
|
|
@ -88,11 +196,23 @@ var valueTests = []pair {
|
|||
pair{(**integer)(nil), "**reflect_test.integer(0)"},
|
||||
pair{(map[string]int32)(nil), "map[string] int32{<can't iterate on maps>}"},
|
||||
pair{(chan<- string)(nil), "chan<- string"},
|
||||
pair { (struct {c chan *int32; d float32}){}, "struct { c chan *int32; d float32 }{chan *int32, 0}" },
|
||||
pair{(struct {
|
||||
c chan *int32;
|
||||
d float32;
|
||||
}){}, "struct { c chan *int32; d float32 }{chan *int32, 0}"},
|
||||
pair{(func(a int8, b int32))(nil), "func(int8, int32)(0)"},
|
||||
pair { (struct {c func(chan *integer, *int8)}){}, "struct { c func(chan *reflect_test.integer, *int8) }{func(chan *reflect_test.integer, *int8)(0)}" },
|
||||
pair { (struct {a int8; b int32}){}, "struct { a int8; b int32 }{0, 0}" },
|
||||
pair { (struct {a int8; b int8; c int32}){}, "struct { a int8; b int8; c int32 }{0, 0, 0}" },
|
||||
pair{(struct {
|
||||
c func(chan *integer, *int8);
|
||||
}){}, "struct { c func(chan *reflect_test.integer, *int8) }{func(chan *reflect_test.integer, *int8)(0)}"},
|
||||
pair{(struct {
|
||||
a int8;
|
||||
b int32;
|
||||
}){}, "struct { a int8; b int32 }{0, 0}"},
|
||||
pair{(struct {
|
||||
a int8;
|
||||
b int8;
|
||||
c int32;
|
||||
}){}, "struct { a int8; b int8; c int32 }{0, 0, 0}"},
|
||||
}
|
||||
|
||||
func testType(t *testing.T, i int, typ Type, want string) {
|
||||
|
|
@ -192,7 +312,7 @@ func TestSetValue(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
var _i = 7;
|
||||
var _i = 7
|
||||
|
||||
var valueToStringTests = []pair{
|
||||
pair{123, "123"},
|
||||
|
|
@ -204,7 +324,7 @@ var valueToStringTests = []pair {
|
|||
pair{[10]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "[10]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}"},
|
||||
pair{&[10]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "*[10]int(&[10]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})"},
|
||||
pair{[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}"},
|
||||
pair { &[]int{1,2,3,4,5,6,7,8,9,10}, "*[]int(&[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})" }
|
||||
pair{&[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, "*[]int(&[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})"},
|
||||
}
|
||||
|
||||
func TestValueToString(t *testing.T) {
|
||||
|
|
@ -249,7 +369,10 @@ func TestAll(t *testing.T) { // TODO(r): wrap up better
|
|||
testType(t, 1, Typeof((int8)(0)), "int8");
|
||||
testType(t, 2, Typeof((*int8)(nil)).(*PtrType).Elem(), "int8");
|
||||
|
||||
typ := Typeof((*struct{c chan *int32; d float32})(nil));
|
||||
typ := Typeof((*struct {
|
||||
c chan *int32;
|
||||
d float32;
|
||||
})(nil));
|
||||
testType(t, 3, typ, "*struct { c chan *int32; d float32 }");
|
||||
etyp := typ.(*PtrType).Elem();
|
||||
testType(t, 4, etyp, "struct { c chan *int32; d float32 }");
|
||||
|
|
@ -283,12 +406,16 @@ func TestAll(t *testing.T) { // TODO(r): wrap up better
|
|||
testType(t, 13, typ.(*ChanType).Elem(), "string");
|
||||
|
||||
// make sure tag strings are not part of element type
|
||||
typ = Typeof(struct{d []uint32 "TAG"}{}).(*StructType).Field(0).Type;
|
||||
typ = Typeof(struct {
|
||||
d []uint32 "TAG";
|
||||
}{}).(*StructType).Field(0).Type;
|
||||
testType(t, 14, typ, "[]uint32");
|
||||
}
|
||||
|
||||
func TestInterfaceGet(t *testing.T) {
|
||||
var inter struct { e interface{ } };
|
||||
var inter struct {
|
||||
e interface{};
|
||||
}
|
||||
inter.e = 123.456;
|
||||
v1 := NewValue(&inter);
|
||||
v2 := v1.(*PtrValue).Elem().(*StructValue).Field(0);
|
||||
|
|
@ -299,7 +426,9 @@ func TestInterfaceGet(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestInterfaceValue(t *testing.T) {
|
||||
var inter struct { e interface{ } };
|
||||
var inter struct {
|
||||
e interface{};
|
||||
}
|
||||
inter.e = 123.456;
|
||||
v1 := NewValue(&inter);
|
||||
v2 := v1.(*PtrValue).Elem().(*StructValue).Field(0);
|
||||
|
|
@ -361,17 +490,22 @@ func TestCopyArray(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestBigUnnamedStruct(t *testing.T) {
|
||||
b := struct{a,b,c,d int64}{1, 2, 3, 4};
|
||||
b := struct {
|
||||
a, b, c, d int64;
|
||||
}{1, 2, 3, 4};
|
||||
v := NewValue(b);
|
||||
b1 := v.Interface().(struct{a,b,c,d int64});
|
||||
b1 := v.Interface().(struct {
|
||||
a, b, c, d int64;
|
||||
});
|
||||
if b1.a != b.a || b1.b != b.b || b1.c != b.c || b1.d != b.d {
|
||||
t.Errorf("NewValue(%v).Interface().(*Big) = %v", b, b1);
|
||||
}
|
||||
}
|
||||
|
||||
type big struct {
|
||||
a, b, c, d, e int64
|
||||
a, b, c, d, e int64;
|
||||
}
|
||||
|
||||
func TestBigStruct(t *testing.T) {
|
||||
b := big{1, 2, 3, 4, 5};
|
||||
v := NewValue(b);
|
||||
|
|
@ -383,7 +517,7 @@ func TestBigStruct(t *testing.T) {
|
|||
|
||||
type Basic struct {
|
||||
x int;
|
||||
y float32
|
||||
y float32;
|
||||
}
|
||||
|
||||
type NotBasic Basic
|
||||
|
|
@ -418,8 +552,8 @@ var deepEqualTests = []DeepEqualTest {
|
|||
DeepEqualTest{Basic{1, 0}, Basic{2, 0}, false},
|
||||
DeepEqualTest{map[int]string{1: "one", 3: "two"}, map[int]string{2: "two", 1: "one"}, false},
|
||||
DeepEqualTest{map[int]string{1: "one", 2: "txo"}, map[int]string{2: "two", 1: "one"}, false},
|
||||
DeepEqualTest{ map[int]string{ 1:"one", }, map[int]string{ 2:"two", 1:"one" }, false },
|
||||
DeepEqualTest{ map[int]string{ 2:"two", 1:"one" }, map[int]string{ 1:"one", }, false },
|
||||
DeepEqualTest{map[int]string{1: "one"}, map[int]string{2: "two", 1: "one"}, false},
|
||||
DeepEqualTest{map[int]string{2: "two", 1: "one"}, map[int]string{1: "one"}, false},
|
||||
DeepEqualTest{nil, 1, false},
|
||||
DeepEqualTest{1, nil, false},
|
||||
|
||||
|
|
@ -456,7 +590,7 @@ func TestTypeof(t *testing.T) {
|
|||
|
||||
type Recursive struct {
|
||||
x int;
|
||||
r *Recursive
|
||||
r *Recursive;
|
||||
}
|
||||
|
||||
func TestDeepEqualRecursiveStruct(t *testing.T) {
|
||||
|
|
@ -472,7 +606,7 @@ type Complex struct {
|
|||
a int;
|
||||
b [3]*Complex;
|
||||
c *string;
|
||||
d map[float]float
|
||||
d map[float]float;
|
||||
}
|
||||
|
||||
func TestDeepEqualComplexStruct(t *testing.T) {
|
||||
|
|
@ -510,14 +644,14 @@ func check2ndField(x interface{}, offs uintptr, t *testing.T) {
|
|||
// from the compiler itself.
|
||||
func TestAlignment(t *testing.T) {
|
||||
type T1inner struct {
|
||||
a int
|
||||
a int;
|
||||
}
|
||||
type T1 struct {
|
||||
T1inner;
|
||||
f int;
|
||||
}
|
||||
type T2inner struct {
|
||||
a, b int
|
||||
a, b int;
|
||||
}
|
||||
type T2 struct {
|
||||
T2inner;
|
||||
|
|
@ -532,79 +666,105 @@ func TestAlignment(t *testing.T) {
|
|||
}
|
||||
|
||||
type IsNiller interface {
|
||||
IsNil() bool
|
||||
IsNil() bool;
|
||||
}
|
||||
|
||||
func Nil(a interface{}, t *testing.T) {
|
||||
n := NewValue(a).(*StructValue).Field(0).(IsNiller);
|
||||
if !n.IsNil() {
|
||||
t.Errorf("%v should be nil", a)
|
||||
t.Errorf("%v should be nil", a);
|
||||
}
|
||||
}
|
||||
|
||||
func NotNil(a interface{}, t *testing.T) {
|
||||
n := NewValue(a).(*StructValue).Field(0).(IsNiller);
|
||||
if n.IsNil() {
|
||||
t.Errorf("value of type %v should not be nil", NewValue(a).Type().String())
|
||||
t.Errorf("value of type %v should not be nil", NewValue(a).Type().String());
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsNil(t *testing.T) {
|
||||
// These do not implement IsNil
|
||||
doNotNil := []interface{}{ int(0), float32(0), struct{a int}{} };
|
||||
doNotNil := []interface{}{int(0), float32(0), struct {
|
||||
a int;
|
||||
}{}};
|
||||
for _, ts := range doNotNil {
|
||||
ty := Typeof(ts);
|
||||
v := MakeZero(ty);
|
||||
if _, ok := v.(IsNiller); ok {
|
||||
t.Errorf("%s is nilable; should not be", ts)
|
||||
t.Errorf("%s is nilable; should not be", ts);
|
||||
}
|
||||
}
|
||||
|
||||
// These do implement IsNil.
|
||||
// Wrap in extra struct to hide interface type.
|
||||
doNil := []interface{}{
|
||||
struct{x *int}{},
|
||||
struct{x interface{}}{},
|
||||
struct{x map[string]int}{},
|
||||
struct{x func()bool}{},
|
||||
struct{x chan int}{},
|
||||
struct{x []string}{}
|
||||
struct {
|
||||
x *int;
|
||||
}{},
|
||||
struct {
|
||||
x interface{};
|
||||
}{},
|
||||
struct {
|
||||
x map[string]int;
|
||||
}{},
|
||||
struct {
|
||||
x func() bool;
|
||||
}{},
|
||||
struct {
|
||||
x chan int;
|
||||
}{},
|
||||
struct {
|
||||
x []string;
|
||||
}{},
|
||||
};
|
||||
for _, ts := range doNil {
|
||||
ty := Typeof(ts).(*StructType).Field(0).Type;
|
||||
v := MakeZero(ty);
|
||||
if _, ok := v.(IsNiller); !ok {
|
||||
t.Errorf("%s %T is not nilable; should be", ts, v)
|
||||
t.Errorf("%s %T is not nilable; should be", ts, v);
|
||||
}
|
||||
}
|
||||
|
||||
// Check the implementations
|
||||
var pi struct {x *int}
|
||||
var pi struct {
|
||||
x *int;
|
||||
}
|
||||
Nil(pi, t);
|
||||
pi.x = new(int);
|
||||
NotNil(pi, t);
|
||||
|
||||
var si struct {x []int}
|
||||
var si struct {
|
||||
x []int;
|
||||
}
|
||||
Nil(si, t);
|
||||
si.x = make([]int, 10);
|
||||
NotNil(si, t);
|
||||
|
||||
var ci struct {x chan int}
|
||||
var ci struct {
|
||||
x chan int;
|
||||
}
|
||||
Nil(ci, t);
|
||||
ci.x = make(chan int);
|
||||
NotNil(ci, t);
|
||||
|
||||
var mi struct {x map[int]int}
|
||||
var mi struct {
|
||||
x map[int]int;
|
||||
}
|
||||
Nil(mi, t);
|
||||
mi.x = make(map[int]int);
|
||||
NotNil(mi, t);
|
||||
|
||||
var ii struct {x interface {}}
|
||||
var ii struct {
|
||||
x interface{};
|
||||
}
|
||||
Nil(ii, t);
|
||||
ii.x = 2;
|
||||
NotNil(ii, t);
|
||||
|
||||
var fi struct {x func(t *testing.T)}
|
||||
var fi struct {
|
||||
x func(t *testing.T);
|
||||
}
|
||||
Nil(fi, t);
|
||||
fi.x = TestIsNil;
|
||||
NotNil(fi, t);
|
||||
|
|
@ -860,7 +1020,11 @@ func TestMethod(t *testing.T) {
|
|||
// Have to wrap interface value in a struct to get at it.
|
||||
// Passing it to NewValue directly would
|
||||
// access the underlying Point, not the interface.
|
||||
var s = struct{x interface{Dist(int) int}}{p};
|
||||
var s = struct {
|
||||
x interface {
|
||||
Dist(int) int;
|
||||
};
|
||||
}{p};
|
||||
pv := NewValue(s).(*StructValue).Field(0);
|
||||
i = pv.Method(0).Call([]Value{NewValue(10)})[0].(*IntValue).Get();
|
||||
if i != 250 {
|
||||
|
|
@ -873,7 +1037,9 @@ func TestInterfaceSet(t *testing.T) {
|
|||
|
||||
var s struct {
|
||||
I interface{};
|
||||
P interface { Dist(int)int };
|
||||
P interface {
|
||||
Dist(int) int;
|
||||
};
|
||||
}
|
||||
sv := NewValue(&s).(*PtrValue).Elem().(*StructValue);
|
||||
sv.Field(0).(*InterfaceValue).Set(NewValue(p));
|
||||
|
|
@ -893,7 +1059,10 @@ func TestInterfaceSet(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
type T1 struct { a string; int; }
|
||||
type T1 struct {
|
||||
a string;
|
||||
int;
|
||||
}
|
||||
|
||||
func TestAnonymousFields(t *testing.T) {
|
||||
var field StructField;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import (
|
|||
|
||||
const ptrSize = uintptr(unsafe.Sizeof((*byte)(nil)))
|
||||
const cannotSet = "cannot set value obtained via unexported struct field"
|
||||
|
||||
type addr unsafe.Pointer
|
||||
|
||||
// TODO: This will have to go away when
|
||||
|
|
@ -80,7 +81,7 @@ type value struct {
|
|||
}
|
||||
|
||||
func (v *value) Type() Type {
|
||||
return v.typ
|
||||
return v.typ;
|
||||
}
|
||||
|
||||
func (v *value) Addr() uintptr {
|
||||
|
|
@ -99,10 +100,12 @@ func (v *value) Interface() interface{} {
|
|||
// to extract correctly.
|
||||
if typ.NumMethod() == 0 {
|
||||
// Extract as interface value without methods.
|
||||
return *(*interface{})(v.addr)
|
||||
return *(*interface{})(v.addr);
|
||||
}
|
||||
// Extract from v.addr as interface value with methods.
|
||||
return *(*interface{ m() })(v.addr)
|
||||
return *(*interface {
|
||||
m();
|
||||
})(v.addr);
|
||||
}
|
||||
return unsafe.Unreflect(v.typ, unsafe.Pointer(v.addr));
|
||||
}
|
||||
|
|
@ -549,7 +552,7 @@ func ArrayCopy(dst, src ArrayOrSliceValue) int {
|
|||
|
||||
// An ArrayValue represents an array.
|
||||
type ArrayValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// Len returns the length of the array.
|
||||
|
|
@ -606,7 +609,7 @@ type SliceHeader struct {
|
|||
|
||||
// A SliceValue represents a slice.
|
||||
type SliceValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
func (v *SliceValue) slice() *SliceHeader {
|
||||
|
|
@ -704,7 +707,7 @@ func MakeSlice(typ *SliceType, len, cap int) *SliceValue {
|
|||
|
||||
// A ChanValue represents a chan.
|
||||
type ChanValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// IsNil returns whether v is a nil channel.
|
||||
|
|
@ -884,7 +887,9 @@ func (v *value) Method(i int) *FuncValue {
|
|||
// implemented in ../pkg/runtime/*/asm.s
|
||||
func call(fn, arg *byte, n uint32)
|
||||
|
||||
type tiny struct { b byte }
|
||||
type tiny struct {
|
||||
b byte;
|
||||
}
|
||||
|
||||
// Call calls the function v with input parameters in.
|
||||
// It returns the function's output parameters as Values.
|
||||
|
|
@ -995,7 +1000,7 @@ func (fv *FuncValue) Call(in []Value) []Value {
|
|||
|
||||
// An InterfaceValue represents an interface value.
|
||||
type InterfaceValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// No Get because v.Interface() is available.
|
||||
|
|
@ -1063,7 +1068,7 @@ func (v *InterfaceValue) Method(i int) *FuncValue {
|
|||
|
||||
// A MapValue represents a map value.
|
||||
type MapValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// IsNil returns whether v is a nil map value.
|
||||
|
|
@ -1141,7 +1146,7 @@ func (v *MapValue) Keys() []Value {
|
|||
m := *(**byte)(v.addr);
|
||||
mlen := int32(0);
|
||||
if m != nil {
|
||||
mlen = maplen(m)
|
||||
mlen = maplen(m);
|
||||
}
|
||||
it := mapiterinit(m);
|
||||
a := make([]Value, mlen);
|
||||
|
|
@ -1170,7 +1175,7 @@ func MakeMap(typ *MapType) *MapValue {
|
|||
|
||||
// A PtrValue represents a pointer.
|
||||
type PtrValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// IsNil returns whether v is a nil pointer.
|
||||
|
|
@ -1237,7 +1242,7 @@ func Indirect(v Value) Value {
|
|||
|
||||
// A StructValue represents a struct value.
|
||||
type StructValue struct {
|
||||
value
|
||||
value;
|
||||
}
|
||||
|
||||
// Set assigns x to v.
|
||||
|
|
@ -1329,7 +1334,9 @@ func newValue(typ Type, addr addr, canSet bool) Value {
|
|||
|
||||
// All values have same memory layout;
|
||||
// build once and convert.
|
||||
v := &struct{value}{value{typ, addr, canSet}};
|
||||
v := &struct {
|
||||
value;
|
||||
}{value{typ, addr, canSet}};
|
||||
switch typ.(type) {
|
||||
case *ArrayType:
|
||||
// TODO(rsc): Something must prevent
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue