Merge pull request #1493 from HyeockJinKim/issue1490

windelbouwman · web-flow · commit dccc22dbb911 · 2019-10-08T21:16:33.000+02:00
Fixed to return the mro function
diff --git a/tests/snippets/types_snippet.py b/tests/snippets/types_snippet.py
@@ -61,3 +61,28 @@ class D(B, C): pass
 assert type in object.__subclasses__()
 
 assert cls.__name__ == 'Cls'
+
+# mro
+assert int.mro() == [int, object]
+assert bool.mro() == [bool, int, object]
+assert object.mro() == [object]
+
+class A:
+    pass
+
+class B(A):
+    pass
+
+assert A.mro() == [A, object]
+assert B.mro() == [B, A, object]
+
+class AA:
+    pass
+
+class BB(AA):
+    pass
+
+class C(B, BB):
+    pass
+
+assert C.mro() == [C, B, A, BB, AA, object]
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -220,8 +220,9 @@ impl PyClassRef {
 }
 
 fn type_mro(cls: PyClassRef, vm: &VirtualMachine) -> PyObjectRef {
-    vm.ctx
-        .new_list(cls.mro.iter().map(|x| x.clone().into_object()).collect())
+    let mut mro = vec![cls.clone().into_object()];
+    mro.extend(cls.mro.iter().map(|x| x.clone().into_object()));
+    vm.ctx.new_list(mro)
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,9 @@ impl PyClassRef {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`fn type_mro(cls: PyClassRef, vm: &VirtualMachine) -> PyObjectRef {`
`223`		`- vm.ctx`
`224`		`- .new_list(cls.mro.iter().map(\|x\| x.clone().into_object()).collect())`
	`223`	`+ let mut mro = vec![cls.clone().into_object()];`
	`224`	`+ mro.extend(cls.mro.iter().map(\|x\| x.clone().into_object()));`
	`225`	`+ vm.ctx.new_list(mro)`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`/*`