Skip to content

Make type() bases arg only take tuples #2342

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

Merged
coolreader18 merged 4 commits into from
Dec 12, 2020
Merged

Make type() bases arg only take tuples #2342

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f2bd59
Make `type()` bases arg only take tuples
carbotaniuman Nov 25, 2020
a6afbdf
Update
carbotaniuman Dec 11, 2020
9243716
Fix clippy
carbotaniuman Dec 12, 2020
6cb89fb
Formaat
carbotaniuman Dec 12, 2020
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
Prev Previous commit
Next Next commit
Update
  • Loading branch information
@carbotaniuman
carbotaniuman committed Dec 11, 2020
commit a6afbdf91191d4a13fc80ff356efd7ee82ac50f6
9 changes: 3 additions & 6 deletions vm/src/builtins/pytype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use super::pystr::PyStrRef;
use super::staticmethod::PyStaticMethod;
use super::tuple::PyTuple;
use super::weakref::PyWeak;
use crate::builtins::tuple::PyTupleRef;
use crate::builtins::tuple::{PyTupleRef, PyTupleTyped};
use crate::function::{FuncArgs, KwArgs};
use crate::pyobject::{
BorrowValue, Either, IdProtocol, PyAttributes, PyClassImpl, PyContext, PyIterable, PyLease,
Expand Down Expand Up @@ -418,13 +418,10 @@ impl PyType {
}));
}

let (name, bases, dict, kwargs): (PyStrRef, PyTupleRef, PyDictRef, KwArgs) =
let (name, bases, dict, kwargs): (PyStrRef, PyTupleTyped<PyTypeRef>, PyDictRef, KwArgs) =
args.clone().bind(vm)?;

// TODO: This is kind of a hack because we lose type information only to redo it
let bases: PyIterable<PyTypeRef> =
PyIterable::try_from_object(vm, bases.into_object()).unwrap();
let bases: Vec<PyTypeRef> = bases.iter(vm)?.collect::<Result<Vec<_>, _>>()?;
let bases = bases.borrow_value().iter().cloned().collect::<Vec<_>>();
let (metatype, base, bases) = if bases.is_empty() {
let base = vm.ctx.types.object_type.clone();
(metatype, base.clone(), vec![base])
Expand Down