Commite6f0618

committed

Unify/simplify code-paths around __new__/__init__.

1 parent039b5bb commite6f0618Copy full SHA for e6f0618

File tree

-17

lines changed

-17

lines changed

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -646,15 +646,5 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py`
`646`	`646`
`647`	`647`	`let bases = vm.context().new_tuple(bases);`
`648`	`648`
`649`		`-// Special case: __new__ must be looked up on the metaclass, not the meta-metaclass as`
`650`		`-// per vm.call(metaclass, "__new__", ...)`
`651`		`-let new = metaclass.get_attr("__new__").unwrap();`
`652`		`-let wrapped = vm.call_get_descriptor(new, metaclass)?;`
`653`		`- vm.invoke(`
`654`		`- wrapped,`
`655`		`-PyFuncArgs{`
`656`		`-args:vec![name_arg, bases, namespace],`
`657`		`-kwargs:vec![],`
`658`		`-},`
`659`		`-)`
	`649`	`+ vm.call_method(&metaclass,"__call__",vec![name_arg, bases, namespace])`
`660`	`650`	`}`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,16 +114,17 @@ pub fn type_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`114`	`114`
`115`	`115`	`pubfntype_call(vm:&mutVirtualMachine,mutargs:PyFuncArgs) ->PyResult{`
`116`	`116`	`debug!("type_call: {:?}", args);`
`117`		`-let typ = args.shift();`
`118`		`-let new = typ.get_attr("__new__").unwrap();`
`119`		`-let obj = vm.invoke(new, args.insert(typ.clone()))?;`
	`117`	`+let cls = args.shift();`
	`118`	`+let new = cls.get_attr("__new__").unwrap();`
	`119`	`+let new_wrapped = vm.call_get_descriptor(new, cls)?;`
	`120`	`+let obj = vm.invoke(new_wrapped, args.clone())?;`
`120`	`121`
`121`		`-ifletSome(init) =obj.typ().get_attr("__init__"){`
`122`		`-let res = vm.invoke(init, args.insert(obj.clone()))?;`
	`122`	`+ifletOk(init) =vm.get_method(obj.clone(),"__init__"){`
	`123`	`+let res = vm.invoke(init, args)?;`
`123`	`124`	`// TODO: assert that return is none?`
`124`	`125`	`if !isinstance(&res,&vm.get_none()){`
`125`	`126`	`// panic!("__init__ must return none");`
`126`		`-// return Err(vm.new_type_error("__init__ must return None".to_string()));`
	`127`	`+//return Err(vm.new_type_error("__init__ must return None".to_string()));`
`127`	`128`	`}`
`128`	`129`	`}`
`129`	`130`	`Ok(obj)`

Comments

(0)