8000 Support testing/clearing Assignable_Proxy_Function's callable by totalgee · Pull Request #480 · ChaiScript/ChaiScript · GitHub
[go: up one dir, main page]
Skip to content

Support testing/clearing Assignable_Proxy_Function's callable #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support testing/clearing Assignable_Proxy_Function's callable #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions include/chaiscript/dispatchkit/proxy_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,13 @@ namespace chaiscript
}

virtual void assign(const std::shared_ptr<const Proxy_Function_Base> &t_rhs) = 0;

// Check whether the function is callable (not empty)
// Note: this conversion *should* be marked "explicit", but virtual together
// with explicit isn't allowed with MSVC (bug)
virtual operator bool() const = 0;

virtual void clear() = 0;
};

template<typename Func>
Expand Down Expand Up @@ -713,6 +720,16 @@ namespace chaiscript
m_f.get() = dispatch::functor<Func>(t_rhs, nullptr);
}

operator bool() const override
{
return static_cast<bool>(m_f.get());
}

void clear() override
{
m_f.get() = nullptr;
}

protected:
Boxed_Value do_call(const Function_Params &params, const Type_Conversions_State &t_conversions) const override
{
Expand Down
44 changes: 44 additions & 0 deletions unittests/compiled_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,50 @@ TEST_CASE("Function objects can be created from chaiscript functions")
CHECK(chai.eval<std::function<std::string (const chaiscript::Boxed_Value &)> >("to_string")(chaiscript::var(6)) == "6");
}

TEST_CASE("Function callbacks can be set, tested and cleared")
{
struct MyObject {
std::function<int(int)> callback;
};

using namespace chaiscript;
ModulePtr m = chaiscript::ModulePtr(new chaiscript::Module());
ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
utility::add_class<MyObject>(*m,
"MyObject",
{ constructor<MyObject ()>(),
constructor<MyObject (const MyObject &)>() },
{ {fun(&MyObject::callback), "callback"},
{fun(static_cast<MyObject & (MyObject::*)(const MyObject &)>(&MyObject::operator=)), "=" }
}
);
m->add(fun([](dispatch::Assignable_Proxy_Function const& func) { return !func; }), "empty");
m->add(fun([](dispatch::Assignable_Proxy_Function& func) { func.clear(); }), "clear");
chai.add(m);

// Function object set from C++
MyObject test;
test.callback = [](int i) { return i + 10; };
chai.add(var(std::ref(test)), "test");
CHECK(chai.eval<int>("!test.callback.empty ? test.callback(13) : -1") == 23);
CHECK(chai.eval<int>("test.callback(9)") == 19);
CHECK(chai.eval<bool>("test.callback.empty") == false);
chai.eval("test.callback.clear");
CHECK(chai.eval<bool>("test.callback.empty") == true);
CHECK_THROWS(chai.eval<int>("test.callback(1)") == 11);

// Function object set from ChaiScript
chai.eval("auto o = MyObject()");
CHECK(chai.eval<bool>("o.callback.empty") == true);
chai.eval("o.callback = fun(int i) { return i + 10 }");
CHECK(chai.eval<bool>("o.callback.empty") == false);
CHECK(chai.eval<int>("!o.callback.empty ? o.callback(13) : -1") == 23);
CHECK(chai.eval<int>("o.callback(9)") == 19);
chai.eval("o.callback.clear");
CHECK(chai.eval<bool>("o.callback.empty") == true);
CHECK_THROWS(chai.eval<int>("o.callback(1)") == 11);

}

TEST_CASE("ChaiScript can be created and destroyed on heap")
{
Expand Down
0