tp_base and better implementation for best_base

youknowone · youknowone · commit c186d69d86a1 · 2020-02-01T15:14:08.000+09:00
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -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)
@@ -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 {
@@ -491,7 +492,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> {
@@ -500,6 +501,7 @@ pub fn new(
     let new_type = PyObject {
         payload: PyClass {
             name: String::from(name),
+            base: Some(base.clone()),
             bases,
             mro,
             subclasses: RefCell::default(),
@@ -548,8 +550,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);
@@ -571,28 +573,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
+    true
+}
+
+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)]
diff --git a/vm/src/slots.rs b/vm/src/slots.rs
@@ -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")
     }
 }
 
diff --git a/vm/src/types.rs b/vm/src/types.rs
@@ -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(),
@@ -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(),
@@ -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(),
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,16 @@ impl Default for PyTpFlags {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`#[derive(Default)]`
`27`		`-pub struct PyClassSlots {`
	`27`	`+pub struct PyClassSlot {`
`28`	`28`	`pub flags: PyTpFlags,`
`29`	`29`	`pub new: Option<PyNativeFunc>,`
`30`	`30`	`pub call: Option<PyNativeFunc>,`
`31`	`31`	`pub descr_get: Option<PyNativeFunc>,`
`32`	`32`	`}`
`33`	`33`
`34`		`-impl std::fmt::Debug for PyClassSlots {`
	`34`	`+impl std::fmt::Debug for PyClassSlot {`
`35`	`35`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`36`		`- f.write_str("PyClassSlots")`
	`36`	`+ f.write_str("PyClassSlot")`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`