Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reformat Zeek in Spicy style

Browse source 
This largely copies over Spicy's `.clang-format` configuration file. The
one place where we deviate is header include order since Zeek depends on
headers being included in a certain order.
This commit is contained in:
Benjamin Bannier 2023-10-10 21:13:34 +02:00
parent 7b8e7ed72c
commit f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
Download patch file Download diff file Expand all files Collapse all files

151
src/module_util.cc
View file

@ -11,109 +11,94 @@
using namespace std;
namespace zeek::detail
{
namespace zeek::detail {
static bool streq(const char* s1, const char* s2)
{
return strcmp(s1, s2) == 0;
}
static bool streq(const char* s1, const char* s2) { return strcmp(s1, s2) == 0; }
TEST_CASE("module_util streq")
{
CHECK(streq("abcd", "abcd") == true);
CHECK(streq("abcd", "efgh") == false);
}
TEST_CASE("module_util streq") {
CHECK(streq("abcd", "abcd") == true);
CHECK(streq("abcd", "efgh") == false);
}
TEST_CASE("module_util extract_module_name")
{
CHECK(extract_module_name("mod") == GLOBAL_MODULE_NAME);
CHECK(extract_module_name("::var") == GLOBAL_MODULE_NAME);
CHECK(extract_module_name("mod::") == "mod");
CHECK(extract_module_name("mod::var") == "mod");
}
TEST_CASE("module_util extract_module_name") {
CHECK(extract_module_name("mod") == GLOBAL_MODULE_NAME);
CHECK(extract_module_name("::var") == GLOBAL_MODULE_NAME);
CHECK(extract_module_name("mod::") == "mod");
CHECK(extract_module_name("mod::var") == "mod");
}
// Returns it without trailing "::" var section.
string extract_module_name(const char* name)
{
string module_name = name;
string::size_type pos = module_name.rfind("::");
string extract_module_name(const char* name) {
string module_name = name;
string::size_type pos = module_name.rfind("::");
if ( pos == string::npos || pos == 0 )
return GLOBAL_MODULE_NAME;
if ( pos == string::npos || pos == 0 )
return GLOBAL_MODULE_NAME;
module_name.erase(pos);
module_name.erase(pos);
return module_name;
}
return module_name;
}
TEST_CASE("module_util extract_var_name")
{
CHECK(extract_var_name("mod") == "mod");
CHECK(extract_var_name("mod::") == "");
CHECK(extract_var_name("mod::var") == "var");
CHECK(extract_var_name("::var") == "var");
}
TEST_CASE("module_util extract_var_name") {
CHECK(extract_var_name("mod") == "mod");
CHECK(extract_var_name("mod::") == "");
CHECK(extract_var_name("mod::var") == "var");
CHECK(extract_var_name("::var") == "var");
}
string extract_var_name(const char* name)
{
string var_name = name;
string::size_type pos = var_name.rfind("::");
string extract_var_name(const char* name) {
string var_name = name;
string::size_type pos = var_name.rfind("::");
if ( pos == string::npos )
return var_name;
if ( pos == string::npos )
return var_name;
if ( pos + 2 > var_name.size() )
return "";
if ( pos + 2 > var_name.size() )
return "";
return var_name.substr(pos + 2);
}
return var_name.substr(pos + 2);
}
TEST_CASE("module_util normalized_module_name")
{
CHECK(normalized_module_name("a") == "a");
CHECK(normalized_module_name("module") == "module");
CHECK(normalized_module_name("module::") == "module");
}
TEST_CASE("module_util normalized_module_name") {
CHECK(normalized_module_name("a") == "a");
CHECK(normalized_module_name("module") == "module");
CHECK(normalized_module_name("module::") == "module");
}
string normalized_module_name(const char* module_name)
{
int mod_len;
if ( (mod_len = strlen(module_name)) >= 2 && streq(module_name + mod_len - 2, "::") )
mod_len -= 2;
string normalized_module_name(const char* module_name) {
int mod_len;
if ( (mod_len = strlen(module_name)) >= 2 && streq(module_name + mod_len - 2, "::") )
mod_len -= 2;
return {module_name, static_cast<size_t>(mod_len)};
}
return {module_name, static_cast<size_t>(mod_len)};
}
TEST_CASE("module_util make_full_var_name")
{
CHECK(make_full_var_name(nullptr, "GLOBAL::var") == "var");
CHECK(make_full_var_name(GLOBAL_MODULE_NAME, "var") == "var");
CHECK(make_full_var_name(nullptr, "notglobal::var") == "notglobal::var");
CHECK(make_full_var_name(nullptr, "::var") == "var");
TEST_CASE("module_util make_full_var_name") {
CHECK(make_full_var_name(nullptr, "GLOBAL::var") == "var");
CHECK(make_full_var_name(GLOBAL_MODULE_NAME, "var") == "var");
CHECK(make_full_var_name(nullptr, "notglobal::var") == "notglobal::var");
CHECK(make_full_var_name(nullptr, "::var") == "var");
CHECK(make_full_var_name("module", "var") == "module::var");
CHECK(make_full_var_name("module::", "var") == "module::var");
CHECK(make_full_var_name("", "var") == "var");
CHECK(make_full_var_name("", "::var") == "var");
}
CHECK(make_full_var_name("module", "var") == "module::var");
CHECK(make_full_var_name("module::", "var") == "module::var");
CHECK(make_full_var_name("", "var") == "var");
CHECK(make_full_var_name("", "::var") == "var");
}
string make_full_var_name(const char* module_name, const char* var_name)
{
if ( ! module_name || streq(module_name, "") || streq(module_name, GLOBAL_MODULE_NAME) ||
strstr(var_name, "::") )
{
if ( streq(GLOBAL_MODULE_NAME, extract_module_name(var_name).c_str()) )
return extract_var_name(var_name);
string make_full_var_name(const char* module_name, const char* var_name) {
if ( ! module_name || streq(module_name, "") || streq(module_name, GLOBAL_MODULE_NAME) || strstr(var_name, "::") ) {
if ( streq(GLOBAL_MODULE_NAME, extract_module_name(var_name).c_str()) )
return extract_var_name(var_name);
return var_name;
}
return var_name;
}
string full_name = normalized_module_name(module_name);
full_name += "::";
full_name += var_name;
string full_name = normalized_module_name(module_name);
full_name += "::";
full_name += var_name;
return full_name;
}
return full_name;
}
} // namespace zeek::detail
} // namespace zeek::detail