Skip to content

Rename reflect.Ptr to reflect.Pointer #2715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Rename reflect.Ptr to reflect.Pointer #2715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/reflect/type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
// if set) and xxx contains the type kind number:
// 0 (0001): Chan
// 1 (0011): Interface
// 2 (0101): Ptr
// 2 (0101): Pointer
// 3 (0111): Slice
// 4 (1001): Array
// 5 (1011): Func
Expand Down Expand Up @@ -54,14 +54,17 @@ const (
UnsafePointer
Chan
Interface
Ptr
Pointer
Slice
Array
Func
Map
Struct
)

// Ptr is the old name for the Pointer kind.
const Ptr = Pointer

func (k Kind) String() string {
switch k {
case Bool:
Expand Down Expand Up @@ -104,7 +107,7 @@ func (k Kind) String() string {
return "chan"
case Interface:
return "interface"
case Ptr:
case Pointer:
return "ptr"
case Slice:
return "slice"
Expand Down Expand Up @@ -252,7 +255,7 @@ type Type interface {
// Chan: ChanDir, Elem
// Func: In, NumIn, Out, NumOut, IsVariadic.
// Map: Key, Elem
// Ptr: Elem
// Pointer: Elem
// Slice: Elem
// Struct: Field, FieldByIndex, FieldByName, FieldByNameFunc, NumField

Expand Down Expand Up @@ -280,7 +283,7 @@ type Type interface {
IsVariadic() bool

// Elem returns a type's element type.
// It panics if the type's Kind is not Array, Chan, Map, Ptr, or Slice.
// It panics if the type's Kind is not Array, Chan, Map, Pointer, or Slice.
Elem() Type

// Field returns a struct type's i'th field.
Expand Down Expand Up @@ -350,13 +353,15 @@ func TypeOf(i interface{}) Type {
return ValueOf(i).typecode
}

func PtrTo(t Type) Type {
if t.Kind() == Ptr {
func PtrTo(t Type) Type { return PointerTo(t) }

func PointerTo(t Type) Type {
if t.Kind() == Pointer {
panic("reflect: cannot make **T type")
}
ptrType := t.(rawType)<<5 | 5 // 0b0101 == 5
if ptrType>>5 != t {
panic("reflect: PtrTo type does not fit")
panic("reflect: PointerTo type does not fit")
}
return ptrType
}
Expand All @@ -382,7 +387,7 @@ func (t rawType) Elem() Type {

func (t rawType) elem() rawType {
switch t.Kind() {
case Chan, Ptr, Slice:
case Chan, Pointer, Slice:
return t.stripPrefix()
case Array:
index := t.stripPrefix()
Expand Down Expand Up @@ -566,7 +571,7 @@ func (t rawType) Size() uintptr {
return 16
case String:
return unsafe.Sizeof("")
case UnsafePointer, Chan, Map, Ptr:
case UnsafePointer, Chan, Map, Pointer:
return unsafe.Sizeof(uintptr(0))
case Slice:
return unsafe.Sizeof([]int{})
Expand Down Expand Up @@ -615,7 +620,7 @@ func (t rawType) Align() int {
return int(unsafe.Alignof(complex128(0)))
case String:
return int(unsafe.Alignof(""))
case UnsafePointer, Chan, Map, Ptr:
case UnsafePointer, Chan, Map, Pointer:
return int(unsafe.Alignof(uintptr(0)))
case Slice:
return int(unsafe.Alignof([]int(nil)))
Expand Down Expand Up @@ -681,7 +686,7 @@ func (t rawType) Comparable() bool {
return true
case Interface:
return true
case Ptr:
case Pointer:
return true
case Slice:
return false
Expand Down