complete rewrite of eval/exec patch

This commit is contained in:
Wenzel Jakob
2016-07-08 10:52:10 +02:00
parent c6ad2c4993
commit 0d3fc3566a
6 changed files with 178 additions and 282 deletions

View File

@@ -1,5 +1,5 @@
/*
example/example18.cpp -- Usage of exec, eval etc.
example/example18.cpp -- Usage of eval() and eval_file()
Copyright (c) 2016 Klemens D. Morgenstern
@@ -8,29 +8,30 @@
*/
#include <pybind11/exec.h>
#include <pybind11/eval.h>
#include "example.h"
void example18() {
py::module main_module = py::module::import("__main__");
py::object main_namespace = main_module.attr("__dict__");
bool executed = false;
bool ok = false;
main_module.def("call_test", [&]()-> int {executed = true; return 42;});
main_module.def("call_test", [&]() -> int {
ok = true;
return 42;
});
cout << "exec test" << endl;
cout << "eval_statements test" << endl;
py::exec(
auto result = py::eval<py::eval_statements>(
"print('Hello World!');\n"
"x = call_test();",
main_namespace);
"x = call_test();", main_namespace);
if (executed)
cout << "exec passed" << endl;
else {
cout << "exec failed" << endl;
}
if (ok && result == py::none())
cout << "eval_statements passed" << endl;
else
cout << "eval_statements failed" << endl;
cout << "eval test" << endl;
@@ -38,83 +39,64 @@ void example18() {
if (val.cast<int>() == 42)
cout << "eval passed" << endl;
else {
else
cout << "eval failed" << endl;
}
ok = false;
cout << "eval_single_statement test" << endl;
executed = false;
cout << "exec_statement test" << endl;
py::eval<py::eval_single_statement>(
"y = call_test();", main_namespace);
py::exec_statement("y = call_test();", main_namespace);
if (ok)
cout << "eval_single_statement passed" << endl;
else
cout << "eval_single_statement failed" << endl;
if (executed)
cout << "exec_statement passed" << endl;
else {
cout << "exec_statement failed" << endl;
}
cout << "exec_file test" << endl;
cout << "eval_file test" << endl;
int val_out;
main_module.def("call_test2", [&](int value) {val_out = value;});
py::exec_file("example18_call.py", main_namespace);
if (val_out == 42)
cout << "exec_file passed" << endl;
else {
cout << "exec_file failed" << endl;
}
executed = false;
cout << "exec failure test" << endl;
try {
py::exec("non-sense code ...");
}
catch (py::error_already_set & err) {
executed = true;
}
if (executed)
cout << "exec failure test passed" << endl;
else {
cout << "exec failure test failed" << endl;
result = py::eval_file("example18_call.py", main_namespace);
} catch (...) {
result = py::eval_file("example/example18_call.py", main_namespace);
}
if (val_out == 42 && result == py::none())
cout << "eval_file passed" << endl;
else
cout << "eval_file failed" << endl;
executed = false;
cout << "exec_file failure test" << endl;
try {
py::exec_file("none-existing file");
}
catch (std::invalid_argument & err) {
executed = true;
}
if (executed)
cout << "exec_file failure test passed" << endl;
else {
cout << "exec_file failure test failed" << endl;
}
executed = false;
ok = false;
cout << "eval failure test" << endl;
try {
py::eval("print('dummy')");
py::eval("nonsense code ...");
} catch (py::error_already_set &) {
PyErr_Clear();
ok = true;
}
catch (py::error_already_set & err) {
executed = true;
}
if (executed)
if (ok)
cout << "eval failure test passed" << endl;
else {
else
cout << "eval failure test failed" << endl;
ok = false;
cout << "eval_file failure test" << endl;
try {
py::eval_file("nonexisting file");
} catch (std::exception &) {
ok = true;
}
if (ok)
cout << "eval_file failure test passed" << endl;
else
cout << "eval_file failure test failed" << endl;
}
void init_ex18(py::module & m) {
m.def("example18", &example18);
m.def("example18", &example18);
}