diff --git a/mypyc/lib-rt/CPy.h b/mypyc/lib-rt/CPy.h index 1c8b59855fc7..dc81c8237527 100644 --- a/mypyc/lib-rt/CPy.h +++ b/mypyc/lib-rt/CPy.h @@ -665,6 +665,7 @@ CPyTagged CPyList_Index(PyObject *list, PyObject *obj); PyObject *CPySequence_Multiply(PyObject *seq, CPyTagged t_size); PyObject *CPySequence_RMultiply(CPyTagged t_size, PyObject *seq); PyObject *CPyList_GetSlice(PyObject *obj, CPyTagged start, CPyTagged end); +PyObject *CPyList_Copy(PyObject *list); int CPySequence_Check(PyObject *obj); diff --git a/mypyc/lib-rt/list_ops.c b/mypyc/lib-rt/list_ops.c index d297ece8f417..8388e1eea73a 100644 --- a/mypyc/lib-rt/list_ops.c +++ b/mypyc/lib-rt/list_ops.c @@ -29,6 +29,20 @@ PyObject *CPyList_Build(Py_ssize_t len, ...) { return res; } +PyObject *CPyList_Copy(PyObject *list) { + if(PyList_CheckExact(list)) { + return PyList_GetSlice(list, 0, PyList_GET_SIZE(list)); + } + _Py_IDENTIFIER(copy); + + PyObject *name = _PyUnicode_FromId(&PyId_copy); + if (name == NULL) { + return NULL; + } + return PyObject_CallMethodNoArgs(list, name); +} + + PyObject *CPyList_GetItemUnsafe(PyObject *list, CPyTagged index) { Py_ssize_t n = CPyTagged_ShortAsSsize_t(index); PyObject *result = PyList_GET_ITEM(list, n); diff --git a/mypyc/primitives/list_ops.py b/mypyc/primitives/list_ops.py index f3af17d3859e..a453e568f00f 100644 --- a/mypyc/primitives/list_ops.py +++ b/mypyc/primitives/list_ops.py @@ -262,6 +262,15 @@ error_kind=ERR_MAGIC, ) +# list.copy() +method_op( + name="copy", + arg_types=[list_rprimitive], + return_type=list_rprimitive, + c_function_name="CPyList_Copy", + error_kind=ERR_MAGIC, +) + # list * int binary_op( name="*", diff --git a/mypyc/test-data/fixtures/ir.py b/mypyc/test-data/fixtures/ir.py index 38fecbc20c65..4fab88fdb3a9 100644 --- a/mypyc/test-data/fixtures/ir.py +++ b/mypyc/test-data/fixtures/ir.py @@ -231,6 +231,7 @@ def sort(self) -> None: pass def reverse(self) -> None: pass def remove(self, o: _T) -> None: pass def index(self, o: _T) -> int: pass + def copy(self) -> List[_T]: pass class dict(Mapping[_K, _V]): @overload diff --git a/mypyc/test-data/irbuild-lists.test b/mypyc/test-data/irbuild-lists.test index 56ad2d53b7eb..e2c656399821 100644 --- a/mypyc/test-data/irbuild-lists.test +++ b/mypyc/test-data/irbuild-lists.test @@ -182,6 +182,18 @@ L0: r1 = r0 << 1 return r1 +[case testListCopy] +from typing import List +from typing import Any +def f(a: List[Any]) -> List[Any]: + return a.copy() +[out] +def f(a): + a, r0 :: list +L0: + r0 = CPyList_Copy(a) + return r0 + [case testListAppend] from typing import List def f(a: List[int], x: int) -> None: diff --git a/mypyc/test-data/run-lists.test b/mypyc/test-data/run-lists.test index 84d5ee121a20..3b2721093e0f 100644 --- a/mypyc/test-data/run-lists.test +++ b/mypyc/test-data/run-lists.test @@ -51,6 +51,55 @@ print(2, a) 1 [-1, 5] 2 [340282366920938463463374607431768211461, -170141183460469231731687303715884105736] +[case testListCopy] +from typing import List +from copysubclass import subc + +def test_list_copy() -> None: + l1 = [1, 2, 3, -4, 5] + l2 = l1.copy() + assert l1.copy() == l1 + assert l1.copy() == l2 + assert l1 == l2 + assert l1.copy() == l2.copy() + l1 = l2.copy() + assert l1 == l2 + assert l1.copy() == l2 + assert l1 == [1, 2, 3, -4, 5] + l2 = [1, 2, -3] + l1 = [] + assert l1.copy() == [] + assert l2.copy() != l1 + assert l2 == l2.copy() + l1 = l2 + assert l1.copy().copy() == l2.copy().copy().copy() + assert l1.copy() == l2.copy() + l1 == [1, 2, -3].copy() + assert l1 == l2 + l2 = [1, 2, 3].copy() + assert l2 != l1 + l1 = [1, 2, 3] + assert l1.copy() == l2.copy() + l3 = [1, 2 , 3, "abcdef"] + assert l3 == l3.copy() + l4 = ["abc", 5, 10] + l4 = l3.copy() + assert l4 == l3 + #subclass testing + l5: subc = subc([1, 2, 3]) + l6 = l5.copy() + assert l6 == l5 + l6 = [1, 2, "3", 4, 5] + l5 = subc([1,2,"3",4,5]) + assert l5.copy() == l6.copy() + l6 = l5.copy() + assert l5 == l6 + +[file copysubclass.py] +from typing import Any +class subc(list[Any]): + pass + [case testSieve] from typing import List