Skip to content

(WIP) tp_base and more implementation for best_base #1732

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

Closed
wants to merge 1 commit into from
Closed

(WIP) tp_base and more implementation for best_base #1732

Show file tree
Hide file tree
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
83 changes: 57 additions & 26 deletions vm/src/obj/objtype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::pyobject::{
IdProtocol, PyAttributes, PyClassImpl, PyContext, PyIterable, PyObject, PyObjectRef, PyRef,
PyResult, PyValue, TypeProtocol,
};
use crate::slots::{PyClassSlots, PyTpFlags};
use crate::slots::{PyClassSlot, PyTpFlags};
use crate::vm::VirtualMachine;

/// type(object_or_name, bases, dict)
Expand All @@ -24,11 +24,12 @@ use crate::vm::VirtualMachine;
#[derive(Debug)]
pub struct PyClass {
pub name: String,
pub bases: Vec<PyClassRef>,
pub base: Option<PyClassRef>, // tp_base
pub bases: Vec<PyClassRef>, // tp_bases
pub mro: Vec<PyClassRef>,
pub subclasses: RefCell<Vec<PyWeak>>,
pub attributes: RefCell<PyAttributes>,
pub slots: RefCell<PyClassSlots>,
pub slots: RefCell<PyClassSlot>,
}

impl fmt::Display for PyClass {
Expand Down Expand Up @@ -361,6 +362,22 @@ pub fn issubclass(subclass: &PyClassRef, cls: &PyClassRef) -> bool {
subclass.is(cls) || mro.iter().any(|c| c.is(cls.as_object()))
}

pub fn is_subtype_base_chain(subclass: &PyClassRef, cls: &PyClassRef) -> bool {
let mut a = subclass;
loop {
if subclass.is(cls) {
return true;
} else {
if let Some(ref base) = a.base {
a = base;
} else {
break;
}
}
}
cls.base.is_none()
}

pub fn type_new(
zelf: PyClassRef,
cls: PyClassRef,
Expand Down Expand Up @@ -491,7 +508,7 @@ fn linearise_mro(mut bases: Vec<Vec<PyClassRef>>) -> Option<Vec<PyClassRef>> {
pub fn new(
typ: PyClassRef,
name: &str,
_base: PyClassRef,
base: PyClassRef,
bases: Vec<PyClassRef>,
dict: HashMap<String, PyObjectRef>,
) -> PyResult<PyClassRef> {
Expand All @@ -500,6 +517,7 @@ pub fn new(
let new_type = PyObject {
payload: PyClass {
name: String::from(name),
base: Some(base.clone()),
bases,
mro,
subclasses: RefCell::default(),
Expand Down Expand Up @@ -548,8 +566,8 @@ fn calculate_meta_class(
}

fn best_base<'a>(bases: &'a [PyClassRef], vm: &VirtualMachine) -> PyResult<PyClassRef> {
// let mut base = None;
// let mut winner = None;
let mut base = None;
let mut winner = None;

for base_i in bases {
// base_proto = PyTuple_GET_ITEM(bases, i);
Expand All @@ -571,28 +589,41 @@ fn best_base<'a>(bases: &'a [PyClassRef], vm: &VirtualMachine) -> PyResult<PyCla
base_i.name
)));
}
// candidate = solid_base(base_i);
// if (winner == NULL) {
// winner = candidate;
// base = base_i;
// }
// else if (PyType_IsSubtype(winner, candidate))
// ;
// else if (PyType_IsSubtype(candidate, winner)) {
// winner = candidate;
// base = base_i;
// }
// else {
// PyErr_SetString(
// PyExc_TypeError,
// "multiple bases have "
// "instance lay-out conflict");
// return NULL;
// }
let candidate = solid_base(base_i, vm);
if winner.is_none() {
winner = Some(candidate);
base = Some(base_i);
} else if issubclass(winner.unwrap(), candidate) {
} else if issubclass(candidate, winner.unwrap()) {
winner = Some(candidate);
base = Some(base_i);
} else {
return Err(
vm.new_type_error("multiple bases have instance lay-out conflict".to_owned())
);
}
}

// FIXME: Ok(base.unwrap()) is expected
Ok(bases[0].clone())
Ok(base.unwrap().clone())
}

fn extra_ivars(_typ: &PyClassRef, _base: &PyClassRef) -> bool {
// TODO
false
}

fn solid_base<'a>(typ: &'a PyClassRef, vm: &'a VirtualMachine) -> &'a PyClassRef {
let base = if let Some(ref tp_base) = typ.base {
solid_base(tp_base, vm)
} else {
&vm.ctx.types.type_type
};

if extra_ivars(typ, base) {
typ
} else {
base
}
}

#[cfg(test)]
Expand Down
6 changes: 3 additions & 3 deletions vm/src/slots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ impl Default for PyTpFlags {
}

#[derive(Default)]
pub struct PyClassSlots {
pub struct PyClassSlot {
pub flags: PyTpFlags,
pub new: Option<PyNativeFunc>,
pub call: Option<PyNativeFunc>,
pub descr_get: Option<PyNativeFunc>,
}

impl std::fmt::Debug for PyClassSlots {
impl std::fmt::Debug for PyClassSlot {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str("PyClassSlots")
f.write_str("PyClassSlot")
}
}

Expand Down
4 changes: 4 additions & 0 deletions vm/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ fn init_type_hierarchy() -> (PyClassRef, PyClassRef) {
dict: None,
payload: PyClass {
name: String::from("type"),
base: None,
bases: vec![],
mro: vec![],
subclasses: RefCell::default(),
Expand All @@ -293,6 +294,7 @@ fn init_type_hierarchy() -> (PyClassRef, PyClassRef) {
dict: None,
payload: PyClass {
name: String::from("object"),
base: None,
bases: vec![],
mro: vec![],
subclasses: RefCell::default(),
Expand All @@ -319,6 +321,7 @@ fn init_type_hierarchy() -> (PyClassRef, PyClassRef) {
// dummy PyClass
let cls = PyClass {
name: Default::default(),
base: Default::default(),
bases: Default::default(),
mro: Default::default(),
subclasses: Default::default(),
Expand Down Expand Up @@ -348,6 +351,7 @@ fn init_type_hierarchy() -> (PyClassRef, PyClassRef) {
let object_type = PyClassRef::new_ref_unchecked(Rc::from_raw(object_type_ptr));

(*type_type_ptr).payload.mro = vec![object_type.clone()];
(*type_type_ptr).payload.base = Some(object_type.clone());
(*type_type_ptr).payload.bases = vec![object_type.clone()];

(type_type, object_type)
Expand Down