diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2023-04-05 20:21:34 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2023-04-26 18:18:15 +0100 |
commit | b2fd91bc41050ec4dd8fbb13b71abb796bc6c8b7 (patch) | |
tree | 9c81d693d53c46a44a1afa59fc527df18556f535 /Examples | |
parent | 6098b26f3ece2096e14695fd02b040bd0658d2ac (diff) | |
download | swig-b2fd91bc41050ec4dd8fbb13b71abb796bc6c8b7.tar.gz |
Add support for all STL containers to be constructible from a Python set
Diffstat (limited to 'Examples')
-rw-r--r-- | Examples/test-suite/cpp11_std_array.i | 10 | ||||
-rw-r--r-- | Examples/test-suite/python/cpp11_std_array_runme.py | 26 | ||||
-rw-r--r-- | Examples/test-suite/python/li_std_containers_int_runme.py | 6 | ||||
-rw-r--r-- | Examples/test-suite/python/li_std_set_runme.py | 10 |
4 files changed, 52 insertions, 0 deletions
diff --git a/Examples/test-suite/cpp11_std_array.i b/Examples/test-suite/cpp11_std_array.i index 9dc11ce9e..ce87db75a 100644 --- a/Examples/test-suite/cpp11_std_array.i +++ b/Examples/test-suite/cpp11_std_array.i @@ -57,6 +57,16 @@ void arrayInPtr(std::array<int, 6> * myarray) { val *= 10; } } + +std::array<int, 6> overloadFunc(std::array<int, 6> myarray) { + std::array<int, 6> newarray(myarray); + for (auto& val : newarray) { + val *= 100; + } + return newarray; +} +void overloadFunc(int i, int j) { +} %} #endif diff --git a/Examples/test-suite/python/cpp11_std_array_runme.py b/Examples/test-suite/python/cpp11_std_array_runme.py index 9e11a3e5b..dbf9bcee3 100644 --- a/Examples/test-suite/python/cpp11_std_array_runme.py +++ b/Examples/test-suite/python/cpp11_std_array_runme.py @@ -56,6 +56,14 @@ def setslice_exception(swigarray, newval): # print("exception: {}".format(e)) pass +def overload_type_exception(pythonlist): + try: + overloadFunc(pythonlist) + raise RuntimeError("overloadFunc({}) missed raising TypeError exception".format(pythonlist)) + except TypeError as e: +# print("exception: {}".format(e)) + pass + # Check std::array has similar behaviour to a Python list # except it is not resizable @@ -161,3 +169,21 @@ compare_containers(ai, [90, 80, 70, 60, 50, 40]) # fill ai.fill(111) compare_containers(ai, [111, 111, 111, 111, 111, 111]) + +# Overloading +newarray = overloadFunc([9, 8, 7, 6, 5, 4]) +compare_containers(newarray, [900, 800, 700, 600, 500, 400]) + +ai = ArrayInt6([9, 8, 7, 6, 5, 4]) +newarray = overloadFunc([9, 8, 7, 6, 5, 4]) +compare_containers(newarray, [900, 800, 700, 600, 500, 400]) + +overloadFunc(1, 2) +overload_type_exception([1, 2, 3, 4, 5, "6"]) +overload_type_exception([1, 2, 3, 4, 5]) +overload_type_exception([1, 2, 3, 4, 5, 6, 7]) + +# Construct from Python set +myset = {11, 12, 13, 14, 15, 16} +ai = ArrayInt6(myset) +compare_containers(ai, list(myset)) diff --git a/Examples/test-suite/python/li_std_containers_int_runme.py b/Examples/test-suite/python/li_std_containers_int_runme.py index f346de220..13c76d3aa 100644 --- a/Examples/test-suite/python/li_std_containers_int_runme.py +++ b/Examples/test-suite/python/li_std_containers_int_runme.py @@ -279,3 +279,9 @@ try: raise RuntimeError("Zero step not caught") except ValueError: pass + +# Construct from set (Iterator protocol, not Sequence protocol) +ps = {11, 22, 33} +iv = vector_int(ps) +il = vector_int(ps) +compare_containers(list(ps), iv, il) diff --git a/Examples/test-suite/python/li_std_set_runme.py b/Examples/test-suite/python/li_std_set_runme.py index 34a1eb19c..7618f7dc8 100644 --- a/Examples/test-suite/python/li_std_set_runme.py +++ b/Examples/test-suite/python/li_std_set_runme.py @@ -92,3 +92,13 @@ for i in s: if (len(sum) != 3 or (not 1 in sum) or (not "hello" in sum) or (not (1, 2) in sum)): raise RuntimeError + +# Create from Python set +s = set_string({"x", "y", "z"}) +sum = "" +for i in s: + sum = sum + i + +if sum != "xyz": + raise RuntimeError + |