Commit647cb08

committed

Remove special case for None payload from boolval.

1 parentd278fb8 commit647cb08Copy full SHA for 647cb08

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`assertbool(1)==True`
`17`	`17`	`assertbool({})==False`
`18`	`18`
	`19`	`+assertbool(NotImplemented)==True`
	`20`	`+assertbool(...)==True`
	`21`	`+`
`19`	`22`	`ifnot1:`
`20`	`23`	`raiseBaseException`
`21`	`24`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ impl IntoPyObject for bool {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-pubfnboolval(vm:&mutVirtualMachine,obj:PyObjectRef) ->Result<bool,PyObjectRef>{`
	`16`	`+pubfnboolval(vm:&mutVirtualMachine,obj:PyObjectRef) ->PyResult<bool>{`
`17`	`17`	`ifletSome(s) = obj.payload::<PyString>(){`
`18`	`18`	`returnOk(!s.value.is_empty());`
`19`	`19`	`}`
`@@ -24,7 +24,6 @@ pub fn boolval(vm: &mut VirtualMachine, obj: PyObjectRef) -> Result<bool, PyObje`
`24`	`24`	`PyObjectPayload::Integer{ref value} => !value.is_zero(),`
`25`	`25`	`PyObjectPayload::Sequence{ref elements} => !elements.borrow().is_empty(),`
`26`	`26`	`PyObjectPayload::Dict{ref elements} => !elements.borrow().is_empty(),`
`27`		`-PyObjectPayload::None{ ..} =>false,`
`28`	`27`	`_ =>{`
`29`	`28`	`ifletOk(f) = vm.get_method(obj.clone(),"__bool__"){`
`30`	`29`	`let bool_res = vm.invoke(f,PyFuncArgs::default())?;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ pub fn init(context: &PyContext) {`
`5`	`5`	`let none_type =&context.none.typ();`
`6`	`6`	`context.set_attr(&none_type,"__new__", context.new_rustfunc(none_new));`
`7`	`7`	`context.set_attr(&none_type,"__repr__", context.new_rustfunc(none_repr));`
	`8`	`+ context.set_attr(&none_type,"__bool__", context.new_rustfunc(none_bool));`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`fnnone_new(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
`@@ -20,3 +21,8 @@ fn none_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`20`	`21`	`arg_check!(vm, args, required =[(_zelf,Some(vm.ctx.none().typ()))]);`
`21`	`22`	`Ok(vm.ctx.new_str("None".to_string()))`
`22`	`23`	`}`
	`24`	`+`
	`25`	`+fnnone_bool(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
	`26`	`+arg_check!(vm, args, required =[(_zelf,Some(vm.ctx.none().typ()))]);`
	`27`	`+Ok(vm.ctx.new_bool(false))`
	`28`	`+}`

Comments

(0)