mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Merge pull request #3135 from youknowone/tp-slot

Browse Source 
tp_ -> slot_
This commit is contained in:
Jeong YunWon
2021-09-30 03:05:27 +09:00
committed by GitHub
parent 65d2aeef26 c3d8e792b7
commit 0787ed0fd3
30 changed files with 120 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
derive/src/pyclass.rs
View File

@@ -70,7 +70,7 @@ pub(crate) fn impl_pyimpl(
quote! {
#imp
impl ::rustpython_vm::PyClassImpl for #ty {
const TP_FLAGS: ::rustpython_vm::slots::PyTpFlags = ::rustpython_vm::slots::PyTpFlags::from_bits_truncate(#flags);
const TP_FLAGS: ::rustpython_vm::slots::PyTypeFlags = ::rustpython_vm::slots::PyTypeFlags::from_bits_truncate(#flags);
fn impl_extend_class(
ctx: &::rustpython_vm::PyContext,
@@ -300,16 +300,16 @@ pub(crate) fn impl_define_exception(
base_class,
ctx_name,
docs,
tp_new,
slot_new,
init,
} = exc_def;
// We need this method, because of how `CPython` copies `__new__`
// from `BaseException` in `SimpleExtendsException` macro.
// See: `BaseException_new`
let tp_new_slot = match tp_new {
Some(tp_call) => quote! { #tp_call(cls, args, vm) },
None => quote! { #base_class::tp_new(cls, args, vm) },
let slot_new_impl = match slot_new {
Some(slot_call) => quote! { #slot_call(cls, args, vm) },
None => quote! { #base_class::slot_new(cls, args, vm) },
};
// We need this method, because of how `CPython` copies `__init__`
@@ -336,12 +336,12 @@ pub(crate) fn impl_define_exception(
#[pyimpl(flags(BASETYPE, HAS_DICT))]
impl #class_name {
#[pyslot]
pub(crate) fn tp_new(
pub(crate) fn slot_new(
cls: ::rustpython_vm::builtins::PyTypeRef,
args: ::rustpython_vm::function::FuncArgs,
vm: &::rustpython_vm::VirtualMachine,
) -> ::rustpython_vm::PyResult {
#tp_new_slot
#slot_new_impl
}
#[pymethod(magic)]
@@ -849,7 +849,7 @@ impl SlotItemMeta {
}
} else {
let ident_str = self.inner().item_name();
let name = if let Some(stripped) = ident_str.strip_prefix("tp_") {
let name = if let Some(stripped) = ident_str.strip_prefix("slot_") {
proc_macro2::Ident::new(stripped, inner.item_ident.span())
} else {
inner.item_ident.clone()
@@ -877,11 +877,11 @@ fn extract_impl_attrs(
) -> std::result::Result<ExtractedImplAttrs, Diagnostic> {
let mut withs = Vec::new();
let mut with_slots = Vec::new();
let mut flags = vec![quote! { ::rustpython_vm::slots::PyTpFlags::DEFAULT.bits() }];
let mut flags = vec![quote! { ::rustpython_vm::slots::PyTypeFlags::DEFAULT.bits() }];
#[cfg(debug_assertions)]
{
flags.push(quote! {
| ::rustpython_vm::slots::PyTpFlags::_CREATED_WITH_FLAGS.bits()
| ::rustpython_vm::slots::PyTypeFlags::_CREATED_WITH_FLAGS.bits()
});
}
@@ -919,7 +919,7 @@ fn extract_impl_attrs(
NestedMeta::Meta(Meta::Path(path)) => {
if let Some(ident) = path.get_ident() {
flags.push(quote_spanned! { ident.span() =>
| ::rustpython_vm::slots::PyTpFlags::#ident.bits()
| ::rustpython_vm::slots::PyTypeFlags::#ident.bits()
});
} else {
bail_span!(
@@ -1048,8 +1048,8 @@ pub(crate) struct PyExceptionDef {
pub ctx_name: Ident,
pub docs: LitStr,
/// Holds optional `tp_new` slot to be used instead of a default one:
pub tp_new: Option<Ident>,
/// Holds optional `slot_new` slot to be used instead of a default one:
pub slot_new: Option<Ident>,
/// We also store `__init__` magic method, that can
pub init: Option<Ident>,
}
@@ -1068,7 +1068,7 @@ impl Parse for PyExceptionDef {
let docs: LitStr = input.parse()?;
input.parse::<Option<Token![,]>>()?;
let tp_new: Option<Ident> = input.parse()?;
let slot_new: Option<Ident> = input.parse()?;
input.parse::<Option<Token![,]>>()?;
let init: Option<Ident> = input.parse()?;
@@ -1079,7 +1079,7 @@ impl Parse for PyExceptionDef {
base_class,
ctx_name,
docs,
tp_new,
slot_new,
init,
})
}

2
vm/src/builtins/bytearray.rs
View File

@@ -98,7 +98,7 @@ pub(crate) fn init(context: &PyContext) {
#[pyimpl(flags(BASETYPE), with(Hashable, Comparable, AsBuffer, Iterable))]
impl PyByteArray {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyByteArray::default().into_pyresult_with_type(vm, cls)
}

2
vm/src/builtins/code.rs
View File

@@ -193,7 +193,7 @@ impl PyCode {}
#[pyimpl]
impl PyRef<PyCode> {
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error("Cannot directly create code object".to_owned()))
}

2
vm/src/builtins/dict.rs
View File

@@ -52,7 +52,7 @@ impl PyValue for PyDict {
#[pyimpl(with(Hashable, Comparable, Iterable), flags(BASETYPE))]
impl PyDict {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyDict::default().into_pyresult_with_type(vm, cls)
}

2
vm/src/builtins/frame.rs
View File

@@ -19,7 +19,7 @@ impl Frame {}
#[pyimpl]
impl FrameRef {
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error("Cannot directly create frame object".to_owned()))
}

2
vm/src/builtins/genericalias.rs
View File

@@ -115,7 +115,7 @@ impl PyGenericAlias {
fn is_typevar(obj: PyObjectRef) -> bool {
let class = obj.class();
class.tp_name() == "TypeVar"
class.slot_name() == "TypeVar"
&& class
.get_attr("__module__")
.and_then(|o| o.downcast_ref::<PyStr>().map(|s| s.as_str() == "typing"))

2
vm/src/builtins/getset.rs
View File

@@ -358,7 +358,7 @@ impl PyGetSet {
#[pyproperty(magic)]
fn qualname(&self) -> String {
format!("{}.{}", self.class.tp_name(), self.name.clone())
format!("{}.{}", self.class.slot_name(), self.name.clone())
}
}

2
vm/src/builtins/list.rs
View File

@@ -392,7 +392,7 @@ impl PyList {
}
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyList::default().into_pyresult_with_type(vm, cls)
}

4
vm/src/builtins/module.rs
View File

@@ -47,7 +47,7 @@ struct ModuleInitArgs {
#[pyimpl(with(SlotGetattro), flags(BASETYPE, HAS_DICT))]
impl PyModule {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyModule {}.into_pyresult_with_type(vm, cls)
}
@@ -56,7 +56,7 @@ impl PyModule {
debug_assert!(crate::TypeProtocol::class(zelf.as_object())
.slots
.flags
.has_feature(crate::slots::PyTpFlags::HAS_DICT));
.has_feature(crate::slots::PyTypeFlags::HAS_DICT));
init_module_dict(
vm,
&zelf.as_object().dict().unwrap(),

12
vm/src/builtins/object.rs
View File

@@ -27,7 +27,7 @@ impl PyValue for PyBaseObject {
impl PyBaseObject {
/// Create and return a new object. See help(type) for accurate signature.
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
// more or less __new__ operator
let dict = if cls.is(&vm.ctx.types.object_type) {
None
@@ -38,7 +38,7 @@ impl PyBaseObject {
}
#[pyslot]
fn tp_richcompare(
fn slot_richcompare(
zelf: &PyObjectRef,
other: &PyObjectRef,
op: PyComparisonOp,
@@ -158,7 +158,7 @@ impl PyBaseObject {
}
#[pyslot]
fn tp_setattro(
fn slot_setattro(
obj: &PyObjectRef,
attr_name: PyStrRef,
value: Option<PyObjectRef>,
@@ -194,7 +194,7 @@ impl PyBaseObject {
)),
_ => Some(format!(
"<{} object at {:#x}>",
class.tp_name(),
class.slot_name(),
zelf.get_id()
)),
}
@@ -294,14 +294,14 @@ impl PyBaseObject {
}
#[pyslot]
fn tp_hash(zelf: &PyObjectRef, _vm: &VirtualMachine) -> PyResult<PyHash> {
fn slot_hash(zelf: &PyObjectRef, _vm: &VirtualMachine) -> PyResult<PyHash> {
Ok(zelf.get_id() as _)
}
/// Return hash(self).
#[pymethod(magic)]
fn hash(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyHash> {
Self::tp_hash(&zelf, vm)
Self::slot_hash(&zelf, vm)
}
}

2
vm/src/builtins/property.rs
View File

@@ -88,7 +88,7 @@ impl SlotDescriptor for PyProperty {
#[pyimpl(with(SlotDescriptor), flags(BASETYPE))]
impl PyProperty {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyProperty {
getter: PyRwLock::new(None),
setter: PyRwLock::new(None),

38
vm/src/builtins/pytype.rs
View File

@@ -5,7 +5,7 @@ use super::{
use crate::common::{ascii, lock::PyRwLock};
use crate::{
function::{FuncArgs, KwArgs, OptionalArg},
slots::{self, Callable, PyTpFlags, PyTypeSlots, SlotGetattro, SlotSetattro},
slots::{self, Callable, PyTypeFlags, PyTypeSlots, SlotGetattro, SlotSetattro},
utils::Either,
IdProtocol, PyAttributes, PyClassImpl, PyContext, PyLease, PyObjectRef, PyRef, PyResult,
PyValue, TryFromObject, TypeProtocol, VirtualMachine,
@@ -71,8 +71,8 @@ impl PyType {
.collect();
let mro = linearise_mro(mros)?;
if base.slots.flags.has_feature(PyTpFlags::HAS_DICT) {
slots.flags |= PyTpFlags::HAS_DICT
if base.slots.flags.has_feature(PyTypeFlags::HAS_DICT) {
slots.flags |= PyTypeFlags::HAS_DICT
}
*slots.name.write() = Some(String::from(name));
@@ -104,7 +104,7 @@ impl PyType {
Ok(new_type)
}
pub fn tp_name(&self) -> String {
pub fn slot_name(&self) -> String {
self.slots.name.read().as_ref().unwrap().to_string()
}
@@ -296,7 +296,7 @@ impl PyType {
subtype = subtype.name(),
)));
}
call_tp_new(zelf, subtype, args, vm)
call_slot_new(zelf, subtype, args, vm)
}
#[pyproperty(name = "__mro__")]
@@ -348,7 +348,7 @@ impl PyType {
#[pyproperty(magic)]
pub fn name(&self) -> String {
self.tp_name().rsplit('.').next().unwrap().to_string()
self.slot_name().rsplit('.').next().unwrap().to_string()
}
#[pymethod(magic)]
@@ -368,7 +368,7 @@ impl PyType {
.unwrap_or_else(|| &name)
)
}
_ => format!("<class '{}'>", self.tp_name()),
_ => format!("<class '{}'>", self.slot_name()),
}
}
@@ -446,7 +446,7 @@ impl PyType {
)
}
#[pyslot]
fn tp_new(metatype: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(metatype: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
vm_trace!("type.__new__ {:?}", args);
let is_type_type = metatype.is(&vm.ctx.types.type_type);
@@ -494,9 +494,9 @@ impl PyType {
let winner = calculate_meta_class(metatype.clone(), &bases, vm)?;
let metatype = if !winner.is(&metatype) {
#[allow(clippy::redundant_clone)] // false positive
if let Some(ref tp_new) = winner.clone().slots.new.load() {
if let Some(ref slot_new) = winner.clone().slots.new.load() {
// Pass it to the winner
return tp_new(winner, args, vm);
return slot_new(winner, args, vm);
}
winner
} else {
@@ -545,7 +545,7 @@ impl PyType {
// TODO: Flags is currently initialized with HAS_DICT. Should be
// updated when __slots__ are supported (toggling the flag off if
// a class has __slots__ defined).
let flags = PyTpFlags::heap_type_flags() | PyTpFlags::HAS_DICT;
let flags = PyTypeFlags::heap_type_flags() | PyTypeFlags::HAS_DICT;
let slots = PyTypeSlots::from_flags(flags);
let typ = Self::new(metatype, name.as_str(), base, bases, attributes, slots)
@@ -672,7 +672,7 @@ impl SlotGetattro for PyType {
} else {
Err(vm.new_attribute_error(format!(
"type object '{}' has no attribute '{}'",
zelf.tp_name(),
zelf.slot_name(),
name
)))
}
@@ -717,7 +717,7 @@ impl SlotSetattro for PyType {
impl Callable for PyType {
fn call(zelf: &PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
vm_trace!("type_call: {:?}", zelf);
let obj = call_tp_new(zelf.clone(), zelf.clone(), args.clone(), vm)?;
let obj = call_slot_new(zelf.clone(), zelf.clone(), args.clone(), vm)?;
if (zelf.is(&vm.ctx.types.type_type) && args.kwargs.is_empty()) || !obj.isinstance(zelf) {
return Ok(obj);
@@ -737,7 +737,7 @@ impl Callable for PyType {
fn find_base_dict_descr(cls: &PyTypeRef, vm: &VirtualMachine) -> Option<PyObjectRef> {
cls.iter_base_chain().skip(1).find_map(|cls| {
// TODO: should actually be some translation of:
// cls.tp_dictoffset != 0 && !cls.flags.contains(HEAPTYPE)
// cls.slot_dictoffset != 0 && !cls.flags.contains(HEAPTYPE)
if cls.is(&vm.ctx.types.type_type) {
cls.get_attr("__dict__")
} else {
@@ -829,15 +829,15 @@ impl<T: DerefToPyType> DerefToPyType for &'_ T {
}
}
pub(crate) fn call_tp_new(
pub(crate) fn call_slot_new(
typ: PyTypeRef,
subtype: PyTypeRef,
args: FuncArgs,
vm: &VirtualMachine,
) -> PyResult {
for cls in typ.deref().iter_mro() {
if let Some(tp_new) = cls.slots.new.load() {
return tp_new(subtype, args, vm);
if let Some(slot_new) = cls.slots.new.load() {
return slot_new(subtype, args, vm);
}
}
unreachable!("Should be able to find a new slot somewhere in the mro")
@@ -937,12 +937,12 @@ fn best_base(bases: &[PyTypeRef], vm: &VirtualMachine) -> PyResult<PyTypeRef> {
// return NULL;
// }
// base_i = (PyTypeObject *)base_proto;
// if (base_i->tp_dict == NULL) {
// if (base_i->slot_dict == NULL) {
// if (PyType_Ready(base_i) < 0)
// return NULL;
// }
if !base_i.slots.flags.has_feature(PyTpFlags::BASETYPE) {
if !base_i.slots.flags.has_feature(PyTypeFlags::BASETYPE) {
return Err(vm.new_type_error(format!(
"type '{}' is not an acceptable base type",
base_i.name()

6
vm/src/builtins/range.rs
View File

@@ -359,7 +359,7 @@ impl PyRange {
}
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let range = if args.args.len() <= 1 {
let stop = args.bind(vm)?;
PyRange::new(cls, stop, vm)
@@ -481,7 +481,7 @@ impl PyValue for PyLongRangeIterator {
#[pyimpl(with(PyIter))]
impl PyLongRangeIterator {
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error("cannot create 'longrange_iterator' instances".to_owned()))
}
@@ -550,7 +550,7 @@ impl PyValue for PyRangeIterator {
#[pyimpl(with(PyIter))]
impl PyRangeIterator {
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error("cannot create 'range_iterator' instances".to_owned()))
}

2
vm/src/builtins/set.rs
View File

@@ -369,7 +369,7 @@ macro_rules! multi_args_set {
#[pyimpl(with(Hashable, Comparable, Iterable), flags(BASETYPE))]
impl PySet {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PySet::default().into_pyresult_with_type(vm, cls)
}

2
vm/src/builtins/slice.rs
View File

@@ -92,7 +92,7 @@ impl PySlice {
}
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let slice: PySlice = match args.args.len() {
0 => {
return Err(

4
vm/src/exceptions.rs
View File

@@ -423,7 +423,7 @@ impl PyBaseException {
}
#[pyslot]
pub(crate) fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
pub(crate) fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyBaseException::new(args.args, vm).into_pyresult_with_type(vm, cls)
}
@@ -1077,7 +1077,7 @@ pub(super) mod types {
}
fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyBaseException::tp_new(cls, args, vm)
PyBaseException::slot_new(cls, args, vm)
}
fn import_error_init(

4
vm/src/macros.rs
View File

@@ -21,12 +21,12 @@ macro_rules! extend_module {
#[macro_export]
macro_rules! py_class {
( $ctx:expr, $class_name:expr, $class_base:expr, { $($name:tt => $value:expr),* $(,)* }) => {
py_class!($ctx, $class_name, $class_base, $crate::slots::PyTpFlags::BASETYPE, { $($name => $value),* })
py_class!($ctx, $class_name, $class_base, $crate::slots::PyTypeFlags::BASETYPE, { $($name => $value),* })
};
( $ctx:expr, $class_name:expr, $class_base:expr, $flags:expr, { $($name:tt => $value:expr),* $(,)* }) => {
{
#[allow(unused_mut)]
let mut slots = $crate::slots::PyTypeSlots::from_flags($crate::slots::PyTpFlags::DEFAULT | $flags);
let mut slots = $crate::slots::PyTypeSlots::from_flags($crate::slots::PyTypeFlags::DEFAULT | $flags);
$($crate::py_class!(@extract_slots($ctx, &mut slots, $name, $value));)*
let py_class = $ctx.new_class($class_name, $class_base, slots);
$($crate::py_class!(@extract_attrs($ctx, &py_class, $name, $value));)*

20
vm/src/pyobject.rs
View File

@@ -20,7 +20,7 @@ use crate::{
dictdatatype::Dict,
exceptions,
function::{IntoFuncArgs, IntoPyNativeFunc},
slots::{PyTpFlags, PyTypeSlots},
slots::{PyTypeFlags, PyTypeSlots},
types::{create_type_with_slots, TypeZoo},
VirtualMachine,
};
@@ -77,7 +77,7 @@ pub struct PyContext {
pub int_cache_pool: Vec<PyIntRef>,
// there should only be exact objects of str in here, no non-strs and no subclasses
pub(crate) string_cache: Dict<()>,
tp_new_wrapper: PyObjectRef,
slot_new_wrapper: PyObjectRef,
}
// Basic objects:
@@ -115,7 +115,7 @@ impl PyContext {
let string_cache = Dict::default();
let new_str = PyRef::new_ref(pystr::PyStr::from("__new__"), types.str_type.clone(), None);
let tp_new_wrapper = create_object(
let slot_new_wrapper = create_object(
PyNativeFuncDef::new(PyType::__new__.into_func(), new_str).into_function(),
&types.builtin_function_or_method_type,
)
@@ -134,7 +134,7 @@ impl PyContext {
exceptions,
int_cache_pool,
string_cache,
tp_new_wrapper,
slot_new_wrapper,
};
TypeZoo::extend(&context);
exceptions::ExceptionZoo::extend(&context);
@@ -859,7 +859,7 @@ pub trait PyValue: fmt::Debug + PyThreadingConstraint + Sized + 'static {
}
fn _into_ref(self, cls: PyTypeRef, vm: &VirtualMachine) -> PyRef<Self> {
let dict = if cls.slots.flags.has_feature(PyTpFlags::HAS_DICT) {
let dict = if cls.slots.flags.has_feature(PyTypeFlags::HAS_DICT) {
Some(vm.ctx.new_dict())
} else {
None
@@ -955,7 +955,7 @@ where
}
pub trait PyClassImpl: PyClassDef {
const TP_FLAGS: PyTpFlags = PyTpFlags::DEFAULT;
const TP_FLAGS: PyTypeFlags = PyTypeFlags::DEFAULT;
fn impl_extend_class(ctx: &PyContext, class: &PyTypeRef);
@@ -964,7 +964,7 @@ pub trait PyClassImpl: PyClassDef {
{
assert!(class.slots.flags.is_created_with_flags());
}
if Self::TP_FLAGS.has_feature(PyTpFlags::HAS_DICT) {
if Self::TP_FLAGS.has_feature(PyTypeFlags::HAS_DICT) {
class.set_str_attr(
"__dict__",
ctx.new_getset(
@@ -984,7 +984,7 @@ pub trait PyClassImpl: PyClassDef {
}
if class.slots.new.load().is_some() {
let bound =
ctx.new_bound_method(ctx.tp_new_wrapper.clone(), class.clone().into_object());
ctx.new_bound_method(ctx.slot_new_wrapper.clone(), class.clone().into_object());
class.set_str_attr("__new__", bound);
}
}
@@ -1154,7 +1154,7 @@ impl PyMethod {
let cls_attr = match cls.get_attr(name.as_str()) {
Some(descr) => {
let descr_cls = descr.class();
let descr_get = if descr_cls.slots.flags.has_feature(PyTpFlags::METHOD_DESCR) {
let descr_get = if descr_cls.slots.flags.has_feature(PyTypeFlags::METHOD_DESCR) {
is_method = true;
None
} else {
@@ -1227,7 +1227,7 @@ impl PyMethod {
.class()
.slots
.flags
.has_feature(PyTpFlags::METHOD_DESCR)
.has_feature(PyTypeFlags::METHOD_DESCR)
{
drop(obj_cls);
Self::Function { target: obj, func }

42
vm/src/slots.rs
View File

@@ -13,7 +13,7 @@ use crossbeam_utils::atomic::AtomicCell;
use std::cmp::Ordering;
bitflags! {
pub struct PyTpFlags: u64 {
pub struct PyTypeFlags: u64 {
const HEAPTYPE = 1 << 9;
const BASETYPE = 1 << 10;
const METHOD_DESCR = 1 << 17;
@@ -24,7 +24,7 @@ bitflags! {
}
}
impl PyTpFlags {
impl PyTypeFlags {
// Default used for both built-in and normal classes: empty, for now.
// CPython default: Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | Py_TPFLAGS_HAVE_VERSION_TAG
pub const DEFAULT: Self = Self::empty();
@@ -46,7 +46,7 @@ impl PyTpFlags {
}
}
impl Default for PyTpFlags {
impl Default for PyTypeFlags {
fn default() -> Self {
Self::DEFAULT
}
@@ -73,6 +73,8 @@ pub(crate) type BufferFunc = fn(&PyObjectRef, &VirtualMachine) -> PyResult<PyBuf
pub(crate) type IterFunc = fn(PyObjectRef, &VirtualMachine) -> PyResult;
pub(crate) type IterNextFunc = fn(&PyObjectRef, &VirtualMachine) -> PyResult;
// The corresponding field in CPython is `tp_` prefixed.
// e.g. name -> tp_name
#[derive(Default)]
pub struct PyTypeSlots {
pub name: PyRwLock<Option<String>>, // tp_name, not class name
@@ -104,7 +106,7 @@ pub struct PyTypeSlots {
pub iternext: AtomicCell<Option<IterNextFunc>>,
// Flags to define presence of optional/expanded features
pub flags: PyTpFlags,
pub flags: PyTypeFlags,
// tp_doc
pub doc: Option<&'static str>,
@@ -129,7 +131,7 @@ pub struct PyTypeSlots {
}
impl PyTypeSlots {
pub fn from_flags(flags: PyTpFlags) -> Self {
pub fn from_flags(flags: PyTypeFlags) -> Self {
Self {
flags,
..Default::default()
@@ -148,7 +150,7 @@ pub trait SlotConstructor: PyValue {
type Args: FromArgs;
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let args: Self::Args = args.bind(vm)?;
Self::py_new(cls, args, vm)
}
@@ -159,7 +161,7 @@ pub trait SlotConstructor: PyValue {
#[pyimpl]
pub trait SlotDestructor: PyValue {
#[pyslot]
fn tp_del(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
fn slot_del(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
if let Some(zelf) = zelf.downcast_ref() {
Self::del(zelf, vm)
} else {
@@ -178,7 +180,7 @@ pub trait SlotDestructor: PyValue {
#[pyimpl]
pub trait Callable: PyValue {
#[pyslot]
fn tp_call(zelf: &PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_call(zelf: &PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
if let Some(zelf) = zelf.downcast_ref() {
Self::call(zelf, args, vm)
} else {
@@ -238,8 +240,8 @@ pub trait SlotDescriptor: PyValue {
// "descriptor '%V' for '%.100s' objects "
// "doesn't apply to a '%.100s' object",
// descr_name((PyDescrObject *)descr), "?",
// descr->d_type->tp_name,
// obj->ob_type->tp_name);
// descr->d_type->slot_name,
// obj->ob_type->slot_name);
// *pres = NULL;
// return 1;
// } else {
@@ -261,7 +263,7 @@ pub trait SlotDescriptor: PyValue {
#[pyimpl]
pub trait Hashable: PyValue {
#[pyslot]
fn tp_hash(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyHash> {
fn slot_hash(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyHash> {
if let Some(zelf) = zelf.downcast_ref() {
Self::hash(zelf, vm)
} else {
@@ -291,7 +293,7 @@ where
#[pyimpl]
pub trait Comparable: PyValue {
#[pyslot]
fn tp_richcompare(
fn slot_richcompare(
zelf: &PyObjectRef,
other: &PyObjectRef,
op: PyComparisonOp,
@@ -460,7 +462,7 @@ impl PyComparisonOp {
#[pyimpl]
pub trait SlotGetattro: PyValue {
#[pyslot]
fn tp_getattro(obj: PyObjectRef, name: PyStrRef, vm: &VirtualMachine) -> PyResult {
fn slot_getattro(obj: PyObjectRef, name: PyStrRef, vm: &VirtualMachine) -> PyResult {
if let Ok(zelf) = obj.downcast::<Self>() {
Self::getattro(zelf, name, vm)
} else {
@@ -480,7 +482,7 @@ pub trait SlotGetattro: PyValue {
#[pyimpl]
pub trait SlotSetattro: PyValue {
#[pyslot]
fn tp_setattro(
fn slot_setattro(
obj: &PyObjectRef,
name: PyStrRef,
value: Option<PyObjectRef>,
@@ -520,7 +522,7 @@ pub trait SlotSetattro: PyValue {
pub trait AsBuffer: PyValue {
// TODO: `flags` parameter
#[pyslot]
fn tp_as_buffer(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBuffer> {
fn slot_as_buffer(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBuffer> {
let zelf = zelf
.downcast_ref()
.ok_or_else(|| vm.new_type_error("unexpected payload for as_buffer".to_owned()))?;
@@ -534,7 +536,7 @@ pub trait AsBuffer: PyValue {
pub trait Iterable: PyValue {
#[pyslot]
#[pymethod(name = "__iter__")]
fn tp_iter(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
fn slot_iter(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if let Ok(zelf) = zelf.downcast() {
Self::iter(zelf, vm)
} else {
@@ -548,7 +550,7 @@ pub trait Iterable: PyValue {
#[pyimpl(with(Iterable))]
pub trait PyIter: PyValue + Iterable {
#[pyslot]
fn tp_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult {
fn slot_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult {
if let Some(zelf) = zelf.downcast_ref() {
Self::next(zelf, vm)
} else {
@@ -560,7 +562,7 @@ pub trait PyIter: PyValue + Iterable {
#[pymethod]
fn __next__(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
Self::tp_iternext(&zelf, vm)
Self::slot_iternext(&zelf, vm)
}
}
@@ -570,10 +572,10 @@ impl<T> Iterable for T
where
T: IteratorIterable,
{
fn tp_iter(zelf: PyObjectRef, _vm: &VirtualMachine) -> PyResult {
fn slot_iter(zelf: PyObjectRef, _vm: &VirtualMachine) -> PyResult {
Ok(zelf)
}
fn iter(_zelf: PyRef<Self>, _vm: &VirtualMachine) -> PyResult {
unreachable!("tp_iter is implemented");
unreachable!("slot_iter is implemented");
}
}

2
vm/src/stdlib/collections.rs
View File

@@ -73,7 +73,7 @@ mod _collections {
#[pyimpl(flags(BASETYPE), with(Comparable, Hashable, Iterable))]
impl PyDeque {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyDeque::default().into_pyresult_with_type(vm, cls)
}

2
vm/src/stdlib/hashlib.rs
View File

@@ -48,7 +48,7 @@ mod hashlib {
}
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Ok(PyHasher::new("md5", HashWrapper::md5())
.into_ref(vm)
.into_object())

32
vm/src/stdlib/io.rs
View File

@@ -380,14 +380,14 @@ mod _io {
}
#[pyslot]
fn tp_del(instance: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
fn slot_del(instance: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
let _ = vm.call_method(instance, "close", ());
Ok(())
}
#[pymethod(magic)]
fn del(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
Self::tp_del(&instance, vm)
Self::slot_del(&instance, vm)
}
#[pymethod(magic)]
@@ -513,18 +513,18 @@ mod _io {
}
impl Iterable for _IOBase {
fn tp_iter(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
fn slot_iter(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
check_closed(&zelf, vm)?;
Ok(zelf)
}
fn iter(_zelf: PyRef<Self>, _vm: &VirtualMachine) -> PyResult {
unreachable!("tp_iter is implemented")
unreachable!("slot_iter is implemented")
}
}
impl PyIter for _IOBase {
fn tp_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult {
fn slot_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult {
let line = vm.call_method(zelf, "readline", ())?;
if !line.clone().try_to_bool(vm)? {
Err(vm.new_stop_iteration())
@@ -534,7 +534,7 @@ mod _io {
}
fn next(_zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult {
unreachable!("tp_iternext is implemented")
unreachable!("slot_iternext is implemented")
}
}
@@ -1370,7 +1370,7 @@ mod _io {
} else {
Err(vm.new_runtime_error(format!(
"reentrant call inside {}.__repr__",
obj.class().tp_name()
obj.class().slot_name()
)))
}
}
@@ -1520,11 +1520,11 @@ mod _io {
fn repr(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
let name_repr = repr_fileobj_name(&zelf, vm)?;
let cls = zelf.class();
let tp_name = cls.tp_name();
let slot_name = cls.slot_name();
let repr = if let Some(name_repr) = name_repr {
format!("<{} name={}>", tp_name, name_repr)
format!("<{} name={}>", slot_name, name_repr)
} else {
format!("<{}>", tp_name)
format!("<{}>", slot_name)
};
Ok(repr)
}
@@ -1665,7 +1665,7 @@ mod _io {
#[pyimpl(with(BufferedMixin, BufferedReadable), flags(BASETYPE, HAS_DICT))]
impl BufferedReader {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}
}
@@ -1714,7 +1714,7 @@ mod _io {
#[pyimpl(with(BufferedMixin, BufferedWritable), flags(BASETYPE, HAS_DICT))]
impl BufferedWriter {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}
}
@@ -1752,7 +1752,7 @@ mod _io {
)]
impl BufferedRandom {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}
}
@@ -1779,7 +1779,7 @@ mod _io {
#[pyimpl(with(BufferedReadable, BufferedWritable), flags(BASETYPE, HAS_DICT))]
impl BufferedRWPair {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}
#[pymethod(magic)]
@@ -2175,7 +2175,7 @@ mod _io {
#[pyimpl(flags(BASETYPE))]
impl TextIOWrapper {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}
@@ -3817,7 +3817,7 @@ mod fileio {
#[pyimpl(flags(BASETYPE, HAS_DICT))]
impl FileIO {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
FileIO {
fd: AtomicCell::new(-1),
closefd: AtomicCell::new(false),

4
vm/src/stdlib/itertools.rs
View File

@@ -31,7 +31,7 @@ mod decl {
#[pyimpl(with(PyIter))]
impl PyItertoolsChain {
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyItertoolsChain {
iterables: args.args,
cur_idx: AtomicCell::new(0),
@@ -710,7 +710,7 @@ mod decl {
#[pyimpl(with(PyIter))]
impl PyItertoolsIslice {
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let (iter, start, stop, step) = match args.args.len() {
0 | 1 => {
return Err(vm.new_type_error(format!(

4
vm/src/stdlib/operator.rs
View File

@@ -435,7 +435,7 @@ mod _operator {
#[pyimpl(with(Callable))]
impl PyAttrGetter {
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let nattr = args.args.len();
// Check we get no keyword and at least one positional.
if !args.kwargs.is_empty() {
@@ -532,7 +532,7 @@ mod _operator {
#[pyimpl(with(Callable))]
impl PyItemGetter {
#[pyslot]
fn tp_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
// Check we get no keyword and at least one positional.
if !args.kwargs.is_empty() {
return Err(vm.new_type_error("itemgetter() takes no keyword arguments".to_owned()));

2
vm/src/stdlib/os.rs
View File

@@ -991,7 +991,7 @@ pub(super) mod _os {
}
#[pyslot]
fn tp_new(_cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let flatten_args = |r: &[PyObjectRef]| {
let mut vec_args = Vec::from(r);
loop {

2
vm/src/stdlib/socket.rs
View File

@@ -456,7 +456,7 @@ impl PySocket {
#[pyimpl(flags(BASETYPE))]
impl PySocket {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Self::default().into_pyresult_with_type(vm, cls)
}

2
vm/src/stdlib/sys.rs
View File

@@ -145,7 +145,7 @@ impl SysFlags {
}
#[pyslot]
fn tp_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error("cannot create 'sys.flags' instances".to_owned()))
}
}

4
vm/src/stdlib/thread.rs
View File

@@ -154,7 +154,7 @@ impl fmt::Debug for PyRLock {
#[pyimpl]
impl PyRLock {
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyRLock {
mu: RawRMutex::INIT,
}
@@ -300,7 +300,7 @@ impl PyLocal {
}
#[pyslot]
fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
PyLocal {
data: ThreadLocal::new(),
}

2
vm/src/stdlib/time.rs
View File

@@ -329,7 +329,7 @@ mod time {
}
#[pyslot]
fn tp_new(_cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
fn slot_new(_cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
// cls is ignorable because this is not a basetype
let seq = args.bind(vm)?;
Ok(vm.new_pyobj(Self::try_from_object(vm, seq)?))

2
vm/src/version.rs
View File

@@ -45,7 +45,7 @@ impl VersionInfo {
serial: SERIAL,
};
#[pyslot]
fn tp_new(
fn slot_new(
_cls: crate::builtins::pytype::PyTypeRef,
_args: crate::function::FuncArgs,
vm: &crate::VirtualMachine,