coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-04-30 19:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 67c98814d2aa03ffa5ce4ac526fcd1071ea8c42f into cd8dacccc657ae88a741823229ee08c314ab4bd8

Browse Source
This commit is contained in:
leftibot 2026-04-19 18:06:53 +08:00 committed by GitHub
commit 742a680730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/chaiscript/dispatchkit/boxed_cast_helper.hpp
View File

@ -122,6 +122,9 @@ namespace chaiscript {
template<typename Result>
struct Cast_Helper_Inner<Result &&> {
static Result &&cast(const Boxed_Value &ob, const Type_Conversions_State *) {
if (ob.is_ref()) {
throw chaiscript::detail::exception::bad_any_cast();
}
return std::move(*static_cast<Result *>(verify_type(ob, typeid(Result), ob.get_ptr())));
}
};

76
unittests/compiled_tests.cpp
View File

@ -2206,3 +2206,79 @@ TEST_CASE("Exception from C++ [] operator is catchable in ChaiScript") {
caught
)") == true);
}
class Issue339_Object {
public:
Issue339_Object() = default;
Issue339_Object(const Issue339_Object &) { ++copy_count(); }
Issue339_Object(Issue339_Object &&) { ++move_count(); }
Issue339_Object &operator=(const Issue339_Object &) {
++copy_assign_count();
return *this;
}
Issue339_Object &operator=(Issue339_Object &&) {
++move_assign_count();
return *this;
}
static int &copy_count() {
static int c = 0;
return c;
}
static int &move_count() {
static int c = 0;
return c;
}
static int &copy_assign_count() {
static int c = 0;
return c;
}
static int &move_assign_count() {
static int c = 0;
return c;
}
static void reset_counts() {
copy_count() = 0;
move_count() = 0;
copy_assign_count() = 0;
move_assign_count() = 0;
}
};
TEST_CASE("Issue #339 - lvalue reference should not implicitly move") {
chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(), create_chaiscript_parser());
auto m = std::make_shared<chaiscript::Module>();
m->add(chaiscript::user_type<Issue339_Object>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object()>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object(const Issue339_Object &)>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object(Issue339_Object &&)>(), "Obj");
m->add(chaiscript::fun(static_cast<Issue339_Object &(Issue339_Object::*)(const Issue339_Object &)>(&Issue339_Object::operator=)), "=");
m->add(chaiscript::fun(static_cast<Issue339_Object &(Issue339_Object::*)(Issue339_Object &&)>(&Issue339_Object::operator=)), "=");
m->add(chaiscript::fun([]() -> Issue339_Object & {
static Issue339_Object persistent;
return persistent;
}),
"getObj");
m->add(chaiscript::fun([]() -> Issue339_Object { return Issue339_Object(); }), "makeObj");
chai.add(m);
SECTION("var from lvalue ref uses copy ctor, not move ctor on the source") {
Issue339_Object::reset_counts();
chai.eval("var o = getObj()");
CHECK(Issue339_Object::copy_count() >= 1);
}
SECTION("assignment from lvalue ref uses copy assign, not move assign") {
Issue339_Object::reset_counts();
chai.eval("var o2 = Obj(); o2 = getObj()");
CHECK(Issue339_Object::copy_assign_count() > 0);
CHECK(Issue339_Object::move_assign_count() == 0);
}
SECTION("return-by-value can still use move") {
Issue339_Object::reset_counts();
chai.eval("var o3 = makeObj()");
CHECK((Issue339_Object::copy_count() + Issue339_Object::move_count()) >= 1);
}
}