Commitbcdb208

committed

Add logic for inheriting metaclass from bases.

1 parent63c4f3b commitbcdb208Copy full SHA for bcdb208

File tree

+54

-1

lines changed

+54

-1

lines changed

Lines changed: 45 additions & 0 deletions

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,15 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py`
`638`	`638`	`let function = args.shift();`
`639`	`639`	`let name_arg = args.shift();`
`640`	`640`	`let bases = args.args.clone();`
`641`		`-let metaclass = args.get_kwarg("metaclass", vm.get_type());`
	`641`	`+letmut metaclass = args.get_kwarg("metaclass", vm.get_type());`
	`642`	`+`
	`643`	`+for basein bases.clone(){`
	`644`	`+if objtype::issubclass(&base.typ(),&metaclass){`
	`645`	`+ metaclass = base.typ();`
	`646`	`+}elseif !objtype::issubclass(&metaclass,&base.typ()){`
	`647`	`+returnErr(vm.new_type_error("metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases".to_string()));`
	`648`	`+}`
	`649`	`+}`
`642`	`650`
`643`	`651`	`let namespace = vm.new_dict();`
`644`	`652`	`&vm.invoke(`

Comments

(0)