From 140546b135067ab17c13ec643a3544fa2bc25ffe Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sun, 17 Jan 2016 22:36:43 +0100 Subject: [PATCH] added an example on using fancier kinds of default arguments --- example/example11.cpp | 15 +++++++++++++++ example/example11.py | 6 +++++- example/example11.ref | 9 ++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/example/example11.cpp b/example/example11.cpp index 9599f940a4..e7069def2e 100644 --- a/example/example11.cpp +++ b/example/example11.cpp @@ -8,11 +8,26 @@ */ #include "example.h" +#include void kw_func(int x, int y) { std::cout << "kw_func(x=" << x << ", y=" << y << ")" << std::endl; } +void kw_func4(const std::vector &entries) { + std::cout << "kw_func4: "; + for (int i : entries) + std::cout << i << " "; + std::cout << endl; +} + void init_ex11(py::module &m) { m.def("kw_func", &kw_func, py::arg("x"), py::arg("y")); m.def("kw_func2", &kw_func, py::arg("x") = 100, py::arg("y") = 200); m.def("kw_func3", [](const char *) { }, py::arg("data") = std::string("Hello world!")); + + /* A fancier default argument */ + std::vector list; + list.push_back(13); + list.push_back(17); + + m.def("kw_func4", &kw_func4, py::arg("myList") = list); } diff --git a/example/example11.py b/example/example11.py index 7d0217a23c..04baa7bc9a 100755 --- a/example/example11.py +++ b/example/example11.py @@ -5,11 +5,12 @@ sys.path.append('.') -from example import kw_func, kw_func2, kw_func3 +from example import kw_func, kw_func2, kw_func3, kw_func4 print(pydoc.render_doc(kw_func, "Help on %s")) print(pydoc.render_doc(kw_func2, "Help on %s")) print(pydoc.render_doc(kw_func3, "Help on %s")) +print(pydoc.render_doc(kw_func4, "Help on %s")) kw_func(5, 10) kw_func(5, y=10) @@ -29,3 +30,6 @@ kw_func2(x=5, y=10, z=12) except Exception as e: print("Caught expected exception: " + str(e)) + +kw_func4() +kw_func4(myList = [1, 2, 3]) diff --git a/example/example11.ref b/example/example11.ref index dafa62cc6f..7d75056f1d 100644 --- a/example/example11.ref +++ b/example/example11.ref @@ -11,7 +11,12 @@ kkww__ffuunncc22(...) Help on built-in function kw_func3 kkww__ffuunncc33(...) - Signature : (data : str = u'Hello world!') -> NoneType + Signature : (data : unicode = u'Hello world!') -> NoneType + +Help on built-in function kw_func4 + +kkww__ffuunncc44(...) + Signature : (myList : list = [13L, 17L]) -> NoneType kw_func(x=5, y=10) kw_func(x=5, y=10) @@ -25,3 +30,5 @@ kw_func(x=5, y=10) Caught expected exception: Incompatible function arguments. The following argument types are supported: 1. (x : int = 100L, y : int = 200L) -> NoneType +kw_func4: 13 17 +kw_func4: 1 2 3