MemberDescrObject -> PyMemberDescriptor

youknowone · youknowone · commit 30b8d7bdadf5 · 2023-04-25T04:54:51.000+09:00
diff --git a/vm/src/builtins/descriptor.rs b/vm/src/builtins/descriptor.rs
@@ -74,14 +74,15 @@ impl std::fmt::Debug for PyMemberDef {
     }
 }
 
+// PyMemberDescrObject in CPython
 #[pyclass(name = "member_descriptor", module = false)]
 #[derive(Debug)]
-pub struct MemberDescrObject {
+pub struct PyMemberDescriptor {
     pub common: DescrObject,
     pub member: PyMemberDef,
 }
 
-impl PyPayload for MemberDescrObject {
+impl PyPayload for PyMemberDescriptor {
     fn class(ctx: &Context) -> &'static Py<PyType> {
         ctx.types.member_descriptor_type
     }
@@ -101,7 +102,7 @@ fn calculate_qualname(descr: &DescrObject, vm: &VirtualMachine) -> PyResult<Opti
 }
 
 #[pyclass(with(GetDescriptor, Constructor, Representable), flags(BASETYPE))]
-impl MemberDescrObject {
+impl PyMemberDescriptor {
     #[pygetset(magic)]
     fn doc(&self) -> Option<String> {
         self.member.doc.to_owned()
@@ -186,9 +187,9 @@ fn set_slot_at_object(
     Ok(())
 }
 
-impl Unconstructible for MemberDescrObject {}
+impl Unconstructible for PyMemberDescriptor {}
 
-impl Representable for MemberDescrObject {
+impl Representable for PyMemberDescriptor {
     #[inline]
     fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> {
         Ok(format!(
@@ -199,7 +200,7 @@ impl Representable for MemberDescrObject {
     }
 }
 
-impl GetDescriptor for MemberDescrObject {
+impl GetDescriptor for PyMemberDescriptor {
     fn descr_get(
         zelf: PyObjectRef,
         obj: Option<PyObjectRef>,
@@ -218,5 +219,5 @@ impl GetDescriptor for MemberDescrObject {
 
 pub fn init(context: &Context) {
     let member_descriptor_type = &context.types.member_descriptor_type;
-    MemberDescrObject::extend_class(context, member_descriptor_type);
+    PyMemberDescriptor::extend_class(context, member_descriptor_type);
 }
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -5,7 +5,7 @@ use super::{
 use crate::{
     builtins::{
         descriptor::{
-            DescrObject, MemberDescrObject, MemberGetter, MemberKind, MemberSetter, PyMemberDef,
+            DescrObject, MemberGetter, MemberKind, MemberSetter, PyMemberDef, PyMemberDescriptor,
         },
         function::PyCellRef,
         tuple::{IntoPyTuple, PyTupleTyped},
@@ -811,8 +811,8 @@ impl PyType {
                     setter: MemberSetter::Offset(offset),
                     doc: None,
                 };
-                let member_descriptor: PyRef<MemberDescrObject> =
-                    vm.ctx.new_pyref(MemberDescrObject {
+                let member_descriptor: PyRef<PyMemberDescriptor> =
+                    vm.ctx.new_pyref(PyMemberDescriptor {
                         common: DescrObject {
                             typ: typ.clone(),
                             name: vm.ctx.intern_str(member.as_str()),
diff --git a/vm/src/types/zoo.rs b/vm/src/types/zoo.rs
@@ -177,7 +177,7 @@ impl TypeZoo {
             not_implemented_type: singletons::PyNotImplemented::init_builtin_type(),
             generic_alias_type: genericalias::PyGenericAlias::init_builtin_type(),
             union_type: union_::PyUnion::init_builtin_type(),
-            member_descriptor_type: descriptor::MemberDescrObject::init_builtin_type(),
+            member_descriptor_type: descriptor::PyMemberDescriptor::init_builtin_type(),
         }
     }
 
diff --git a/vm/src/vm/context.rs b/vm/src/vm/context.rs
@@ -4,8 +4,8 @@ use crate::{
         bytes,
         code::{self, PyCode},
         descriptor::{
-            DescrObject, MemberDescrObject, MemberGetter, MemberKind, MemberSetter,
-            MemberSetterFunc, PyMemberDef,
+            DescrObject, MemberGetter, MemberKind, MemberSetter, MemberSetterFunc, PyMemberDef,
+            PyMemberDescriptor,
         },
         getset::PyGetSet,
         object, pystr,
@@ -500,15 +500,15 @@ impl Context {
         getter: fn(&VirtualMachine, PyObjectRef) -> PyResult,
         setter: MemberSetterFunc,
         class: &'static Py<PyType>,
-    ) -> PyRef<MemberDescrObject> {
+    ) -> PyRef<PyMemberDescriptor> {
         let member_def = PyMemberDef {
             name: name.to_owned(),
             kind: member_kind,
             getter: MemberGetter::Getter(getter),
             setter: MemberSetter::Setter(setter),
             doc: None,
         };
-        let member_descriptor = MemberDescrObject {
+        let member_descriptor = PyMemberDescriptor {
             common: DescrObject {
                 typ: class.to_owned(),
                 name: self.intern_str(name),

Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,15 @@ impl std::fmt::Debug for PyMemberDef {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
	`77`	`+// PyMemberDescrObject in CPython`
`77`	`78`	`#[pyclass(name = "member_descriptor", module = false)]`
`78`	`79`	`#[derive(Debug)]`
`79`		`-pub struct MemberDescrObject {`
	`80`	`+pub struct PyMemberDescriptor {`
`80`	`81`	`pub common: DescrObject,`
`81`	`82`	`pub member: PyMemberDef,`
`82`	`83`	`}`
`83`	`84`
`84`		`-impl PyPayload for MemberDescrObject {`
	`85`	`+impl PyPayload for PyMemberDescriptor {`
`85`	`86`	`fn class(ctx: &Context) -> &'static Py<PyType> {`
`86`	`87`	`ctx.types.member_descriptor_type`
`87`	`88`	`}`
`@@ -101,7 +102,7 @@ fn calculate_qualname(descr: &DescrObject, vm: &VirtualMachine) -> PyResult<Opti`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`#[pyclass(with(GetDescriptor, Constructor, Representable), flags(BASETYPE))]`
`104`		`-impl MemberDescrObject {`
	`105`	`+impl PyMemberDescriptor {`
`105`	`106`	`#[pygetset(magic)]`
`106`	`107`	`fn doc(&self) -> Option<String> {`
`107`	`108`	`self.member.doc.to_owned()`
`@@ -186,9 +187,9 @@ fn set_slot_at_object(`
`186`	`187`	`Ok(())`
`187`	`188`	`}`
`188`	`189`
`189`		`-impl Unconstructible for MemberDescrObject {}`
	`190`	`+impl Unconstructible for PyMemberDescriptor {}`
`190`	`191`
`191`		`-impl Representable for MemberDescrObject {`
	`192`	`+impl Representable for PyMemberDescriptor {`
`192`	`193`	`#[inline]`
`193`	`194`	`fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> {`
`194`	`195`	`Ok(format!(`
`@@ -199,7 +200,7 @@ impl Representable for MemberDescrObject {`
`199`	`200`	`}`
`200`	`201`	`}`
`201`	`202`
`202`		`-impl GetDescriptor for MemberDescrObject {`
	`203`	`+impl GetDescriptor for PyMemberDescriptor {`
`203`	`204`	`fn descr_get(`
`204`	`205`	`zelf: PyObjectRef,`
`205`	`206`	`obj: Option<PyObjectRef>,`
`@@ -218,5 +219,5 @@ impl GetDescriptor for MemberDescrObject {`
`218`	`219`
`219`	`220`	`pub fn init(context: &Context) {`
`220`	`221`	`let member_descriptor_type = &context.types.member_descriptor_type;`
`221`		`- MemberDescrObject::extend_class(context, member_descriptor_type);`
	`222`	`+ PyMemberDescriptor::extend_class(context, member_descriptor_type);`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ impl TypeZoo {`
`177`	`177`	`not_implemented_type: singletons::PyNotImplemented::init_builtin_type(),`
`178`	`178`	`generic_alias_type: genericalias::PyGenericAlias::init_builtin_type(),`
`179`	`179`	`union_type: union_::PyUnion::init_builtin_type(),`
`180`		`- member_descriptor_type: descriptor::MemberDescrObject::init_builtin_type(),`
	`180`	`+ member_descriptor_type: descriptor::PyMemberDescriptor::init_builtin_type(),`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`