status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

cpp: Allow checking if evmc::vm is valid

This commit is contained in:
Paweł Bylica 2019-07-03 18:57:08 +02:00
parent fff439a53b
commit 1f3243a55e
No known key found for this signature in database
GPG Key ID: 7A0C037434FE77EF
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/evmc/evmc.hpp
View File

@ -117,6 +117,9 @@ public:
set_option(option.first, option.second); set_option(option.first, option.second);
} }
/// Checks if contains a valid pointer to the VM instance.
explicit operator bool() const noexcept { return m_instance != nullptr; }
/// Checks whenever the VM instance is ABI compatible with the current EVMC API. /// Checks whenever the VM instance is ABI compatible with the current EVMC API.
bool is_abi_compatible() const noexcept { return m_instance->abi_version == EVMC_ABI_VERSION; } bool is_abi_compatible() const noexcept { return m_instance->abi_version == EVMC_ABI_VERSION; }

20
test/unittests/test_cpp.cpp
View File

@ -70,6 +70,13 @@ TEST(cpp, vm_set_option)
EXPECT_EQ(vm.set_option("1", "2"), EVMC_SET_OPTION_INVALID_NAME); EXPECT_EQ(vm.set_option("1", "2"), EVMC_SET_OPTION_INVALID_NAME);
} }
TEST(cpp, vm_null)
{
evmc::vm vm;
EXPECT_FALSE(vm);
EXPECT_TRUE(!vm);
}
TEST(cpp, vm_move) TEST(cpp, vm_move)
{ {
static int destroy_counter = 0; static int destroy_counter = 0;
@ -83,25 +90,32 @@ TEST(cpp, vm_move)
auto v2 = template_instance; auto v2 = template_instance;
auto vm1 = evmc::vm{&v1}; auto vm1 = evmc::vm{&v1};
EXPECT_TRUE(vm1);
vm1 = evmc::vm{&v2}; vm1 = evmc::vm{&v2};
(void)vm1; EXPECT_TRUE(vm1);
} }
EXPECT_EQ(destroy_counter, 2); EXPECT_EQ(destroy_counter, 2);
{ {
auto v1 = template_instance; auto v1 = template_instance;
auto vm1 = evmc::vm{&v1}; auto vm1 = evmc::vm{&v1};
EXPECT_TRUE(vm1);
vm1 = evmc::vm{}; vm1 = evmc::vm{};
(void)vm1; EXPECT_FALSE(vm1);
} }
EXPECT_EQ(destroy_counter, 3); EXPECT_EQ(destroy_counter, 3);
{ {
auto v1 = template_instance; auto v1 = template_instance;
auto vm1 = evmc::vm{&v1}; auto vm1 = evmc::vm{&v1};
EXPECT_TRUE(vm1);
auto vm2 = std::move(vm1); auto vm2 = std::move(vm1);
EXPECT_TRUE(vm2);
EXPECT_FALSE(vm1); // NOLINT
auto vm3 = std::move(vm2); auto vm3 = std::move(vm2);
(void)vm3; EXPECT_TRUE(vm3);
EXPECT_FALSE(vm2); // NOLINT
EXPECT_FALSE(vm1);
} }
EXPECT_EQ(destroy_counter, 4); EXPECT_EQ(destroy_counter, 4);
} }