diff --git a/vm/src/builtins/mod.rs b/vm/src/builtins/mod.rs index 640b1a0d3..2abbd0833 100644 --- a/vm/src/builtins/mod.rs +++ b/vm/src/builtins/mod.rs @@ -82,8 +82,8 @@ pub(crate) mod weakref; pub use weakref::PyWeak; pub(crate) mod zip; pub use zip::PyZip; -pub(crate) mod unionobject; -pub use unionobject::PyUnionObject; +pub(crate) mod pyunion; +pub use pyunion::PyUnion; pub use float::try_to_bigint as try_f64_to_bigint; pub use int::try_to_float as try_bigint_to_f64; diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs index 74d81336c..f1b4e536c 100644 --- a/vm/src/builtins/pytype.rs +++ b/vm/src/builtins/pytype.rs @@ -1,5 +1,5 @@ use super::{ - mappingproxy::PyMappingProxy, object, unionobject, PyClassMethod, PyDictRef, PyList, + mappingproxy::PyMappingProxy, object, pyunion, PyClassMethod, PyDictRef, PyList, PyStaticMethod, PyStr, PyStrRef, PyTuple, PyTupleRef, }; use crate::common::{ @@ -385,7 +385,7 @@ impl PyType { #[pymethod(name = "__ror__")] #[pymethod(magic)] pub fn or(zelf: PyObjectRef, other: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef { - unionobject::union_type_or(zelf, other, vm) + pyunion::union_type_or(zelf, other, vm) } #[pyslot] diff --git a/vm/src/builtins/unionobject.rs b/vm/src/builtins/pyunion.rs similarity index 94% rename from vm/src/builtins/unionobject.rs rename to vm/src/builtins/pyunion.rs index 8927deebd..3cbdc051c 100644 --- a/vm/src/builtins/unionobject.rs +++ b/vm/src/builtins/pyunion.rs @@ -14,25 +14,25 @@ use super::genericalias; static CLS_ATTRS: [&str; 1] = ["__module__"]; #[pyclass(module = "types", name = "UnionType")] -pub struct PyUnionObject { +pub struct PyUnion { args: PyTupleRef, parameters: PyTupleRef, } -impl fmt::Debug for PyUnionObject { +impl fmt::Debug for PyUnion { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.write_str("UnionObject") } } -impl PyValue for PyUnionObject { +impl PyValue for PyUnion { fn class(vm: &VirtualMachine) -> &PyTypeRef { &vm.ctx.types.union_type } } #[pyimpl(with(Hashable, Comparable, AsMapping), flags(BASETYPE))] -impl PyUnionObject { +impl PyUnion { pub fn new(args: PyTupleRef, vm: &VirtualMachine) -> Self { let parameters = make_parameters(&args, vm); Self { args, parameters } @@ -150,7 +150,7 @@ fn make_parameters(args: &PyTupleRef, vm: &VirtualMachine) -> PyTupleRef { fn flatten_args(args: PyTupleRef, vm: &VirtualMachine) -> PyTupleRef { let mut total_args = 0; for arg in args.as_slice() { - if let Some(pyref) = arg.downcast_ref::() { + if let Some(pyref) = arg.downcast_ref::() { total_args += pyref.args.len(); } else { total_args += 1; @@ -159,7 +159,7 @@ fn flatten_args(args: PyTupleRef, vm: &VirtualMachine) -> PyTupleRef { let mut flattened_args = Vec::with_capacity(total_args); for arg in args.as_slice() { - if let Some(pyref) = arg.downcast_ref::() { + if let Some(pyref) = arg.downcast_ref::() { for arg in pyref.args.as_slice() { flattened_args.push(arg.clone()); } @@ -206,11 +206,11 @@ fn make_union(args: PyTupleRef, vm: &VirtualMachine) -> PyObjectRef { let args = dedup_and_flatten_args(args, vm); match args.len() { 1 => args.fast_getitem(0), - _ => PyUnionObject::new(args, vm).into_pyobject(vm), + _ => PyUnion::new(args, vm).into_pyobject(vm), } } -impl PyUnionObject { +impl PyUnion { fn getitem(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult { let new_args = genericalias::subs_parameters( |vm| self.repr(vm), @@ -241,13 +241,13 @@ impl PyUnionObject { }; } -impl AsMapping for PyUnionObject { +impl AsMapping for PyUnion { fn as_mapping(_zelf: &PyObjectView, _vm: &VirtualMachine) -> PyMappingMethods { Self::MAPPING_METHODS } } -impl Comparable for PyUnionObject { +impl Comparable for PyUnion { fn cmp( zelf: &crate::PyObjectView, other: &PyObject, @@ -264,7 +264,7 @@ impl Comparable for PyUnionObject { } } -impl Hashable for PyUnionObject { +impl Hashable for PyUnion { #[inline] fn hash(zelf: &crate::PyObjectView, vm: &VirtualMachine) -> PyResult { let it = PyTuple::iter(zelf.args.clone(), vm); @@ -273,7 +273,7 @@ impl Hashable for PyUnionObject { } } -impl GetAttr for PyUnionObject { +impl GetAttr for PyUnion { fn getattro(zelf: PyRef, attr: PyStrRef, vm: &VirtualMachine) -> PyResult { for exc in CLS_ATTRS.iter() { if *(*exc) == attr.to_string() { @@ -286,5 +286,5 @@ impl GetAttr for PyUnionObject { pub fn init(context: &PyContext) { let union_type = &context.types.union_type; - PyUnionObject::extend_class(context, union_type); + PyUnion::extend_class(context, union_type); } diff --git a/vm/src/types/zoo.rs b/vm/src/types/zoo.rs index 9c88087ab..c282c2831 100644 --- a/vm/src/types/zoo.rs +++ b/vm/src/types/zoo.rs @@ -3,7 +3,7 @@ use crate::builtins::{ enumerate, filter, float, frame, function, generator, genericalias, getset, int, iter, list, map, mappingproxy, memory, module, namespace, object, property, pybool, pystr, pysuper, pytype::{self, PyTypeRef}, - range, set, singletons, slice, staticmethod, traceback, tuple, unionobject, weakproxy, weakref, + pyunion, range, set, singletons, slice, staticmethod, traceback, tuple, weakproxy, weakref, zip, }; use crate::{PyContext, StaticType}; @@ -170,7 +170,7 @@ impl TypeZoo { none_type: singletons::PyNone::init_bare_type().clone(), not_implemented_type: singletons::PyNotImplemented::init_bare_type().clone(), generic_alias_type: genericalias::PyGenericAlias::init_bare_type().clone(), - union_type: unionobject::PyUnionObject::init_bare_type().clone(), + union_type: pyunion::PyUnion::init_bare_type().clone(), } } @@ -217,6 +217,6 @@ impl TypeZoo { mappingproxy::init(context); traceback::init(context); genericalias::init(context); - unionobject::init(context); + pyunion::init(context); } }