Skip to content

Fix the Display impl for PyRef #707

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
merged 3 commits into from
Mar 21, 2019
Merged

Fix the Display impl for PyRef #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54753b3
list, tuple: return NotImplemented for unsupported comparisons
OddCoincidence Mar 21, 2019
0b1b668
Fix Display impl for PyRef
OddCoincidence Mar 21, 2019
5980771
Merge remote-tracking branch 'origin/master' into joey/proper-pyref-d…
OddCoincidence Mar 21, 2019
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
37 changes: 21 additions & 16 deletions vm/src/obj/objlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,57 +245,62 @@ impl PyListRef {
}
}

fn eq(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn eq(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if self.as_object().is(&other) {
return Ok(true);
return Ok(vm.new_bool(true));
}

if objtype::isinstance(&other, &vm.ctx.list_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_equal(vm, &zelf, &other)?)
let res = seq_equal(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Ok(false)
Ok(vm.ctx.not_implemented())
}
}

fn lt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn lt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.list_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_lt(vm, &zelf, &other)?)
let res = seq_lt(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '<'", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn gt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn gt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.list_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_gt(vm, &zelf, &other)?)
let res = seq_gt(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '>'", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn ge(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn ge(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.list_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_ge(vm, &zelf, &other)?)
let res = seq_ge(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '>='", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn le(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn le(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.list_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_le(vm, &zelf, &other)?)
let res = seq_le(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '<='", self, other)))
Ok(vm.ctx.not_implemented())
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions vm/src/obj/objstr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::fmt;
use std::hash::{Hash, Hasher};
use std::ops::Range;
use std::str::FromStr;
Expand Down Expand Up @@ -25,11 +26,9 @@ pub struct PyString {
pub value: String,
}

impl<T: ToString> From<T> for PyString {
fn from(t: T) -> PyString {
PyString {
value: t.to_string(),
}
impl fmt::Display for PyString {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(&self.value, f)
}
}

Expand Down
37 changes: 21 additions & 16 deletions vm/src/obj/objtuple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,43 +46,47 @@ impl PyValue for PyTuple {
pub type PyTupleRef = PyRef<PyTuple>;

impl PyTupleRef {
fn lt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn lt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.tuple_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_lt(vm, &zelf, &other)?)
let res = seq_lt(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '<'", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn gt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn gt(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.tuple_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_gt(vm, &zelf, &other)?)
let res = seq_gt(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '>'", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn ge(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn ge(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.tuple_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_ge(vm, &zelf, &other)?)
let res = seq_ge(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '>='", self, other)))
Ok(vm.ctx.not_implemented())
}
}

fn le(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn le(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.tuple_type()) {
let zelf = self.elements.borrow();
let other = get_elements(&other);
Ok(seq_le(vm, &zelf, &other)?)
let res = seq_le(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {} using '<='", self, other)))
Ok(vm.ctx.not_implemented())
}
}

Expand All @@ -93,7 +97,7 @@ impl PyTupleRef {
let elements = e1.iter().chain(e2.iter()).cloned().collect();
Ok(vm.ctx.new_tuple(elements))
} else {
Err(vm.new_type_error(format!("Cannot add {} and {}", self, other)))
Ok(vm.ctx.not_implemented())
}
}

Expand All @@ -112,13 +116,14 @@ impl PyTupleRef {
Ok(count)
}

fn eq(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult<bool> {
fn eq(self, other: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
if objtype::isinstance(&other, &vm.ctx.tuple_type()) {
let zelf = &self.elements.borrow();
let other = get_elements(&other);
seq_equal(vm, &zelf, &other)
let res = seq_equal(vm, &zelf, &other)?;
Ok(vm.new_bool(res))
} else {
Ok(false)
Ok(vm.ctx.not_implemented())
}
}

Expand Down
7 changes: 7 additions & 0 deletions vm/src/obj/objtype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::fmt;

use crate::function::PyFuncArgs;
use crate::pyobject::{
Expand All @@ -20,6 +21,12 @@ pub struct PyClass {
pub mro: Vec<PyClassRef>,
}

impl fmt::Display for PyClass {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(&self.name, f)
}
}

pub type PyClassRef = PyRef<PyClass>;

impl PyValue for PyClass {
Expand Down
8 changes: 6 additions & 2 deletions vm/src/pyobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,13 @@ impl<T> IntoPyObject for PyRef<T> {
}
}

impl<T> fmt::Display for PyRef<T> {
impl<T: fmt::Display> fmt::Display for PyRef<T>
where
T: PyValue + fmt::Display,
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.obj.fmt(f)
let value: &T = self.obj.payload().expect("unexpected payload for type");
fmt::Display::fmt(value, f)
}
}

Expand Down