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

145
src/ScriptValidation.cc
View file

@ -5,114 +5,103 @@
#include "zeek/Stmt.h"
#include "zeek/Traverse.h"
namespace zeek::detail
{
namespace zeek::detail {
// Validate context of break and next statement usage.
class BreakNextScriptValidation : public TraversalCallback
{
class BreakNextScriptValidation : public TraversalCallback {
public:
BreakNextScriptValidation(bool _report) : report(_report) { }
BreakNextScriptValidation(bool _report) : report(_report) {}
TraversalCode PreStmt(const Stmt* stmt) override
{
if ( ! StmtIsRelevant(stmt) )
return TC_CONTINUE;
TraversalCode PreStmt(const Stmt* stmt) override {
if ( ! StmtIsRelevant(stmt) )
return TC_CONTINUE;
stmt_depths[stmt->Tag()] += 1;
stmt_depths[stmt->Tag()] += 1;
if ( stmt->Tag() == STMT_BREAK && ! BreakStmtIsValid() )
Report(stmt, "break statement used outside of for, while or "
"switch statement and not within a hook.");
if ( stmt->Tag() == STMT_BREAK && ! BreakStmtIsValid() )
Report(stmt,
"break statement used outside of for, while or "
"switch statement and not within a hook.");
if ( stmt->Tag() == STMT_NEXT && ! NextStmtIsValid() )
Report(stmt, "next statement used outside of for or while statement.");
if ( stmt->Tag() == STMT_NEXT && ! NextStmtIsValid() )
Report(stmt, "next statement used outside of for or while statement.");
return TC_CONTINUE;
}
return TC_CONTINUE;
}
TraversalCode PostStmt(const Stmt* stmt) override
{
if ( ! StmtIsRelevant(stmt) )
return TC_CONTINUE;
TraversalCode PostStmt(const Stmt* stmt) override {
if ( ! StmtIsRelevant(stmt) )
return TC_CONTINUE;
--stmt_depths[stmt->Tag()];
--stmt_depths[stmt->Tag()];
assert(stmt_depths[stmt->Tag()] >= 0);
assert(stmt_depths[stmt->Tag()] >= 0);
return TC_CONTINUE;
}
return TC_CONTINUE;
}
TraversalCode PreFunction(const zeek::Func* func) override
{
if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK )
++hook_depth;
TraversalCode PreFunction(const zeek::Func* func) override {
if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK )
++hook_depth;
assert(hook_depth <= 1);
assert(hook_depth <= 1);
return TC_CONTINUE;
}
return TC_CONTINUE;
}
TraversalCode PostFunction(const zeek::Func* func) override
{
if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK )
--hook_depth;
TraversalCode PostFunction(const zeek::Func* func) override {
if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK )
--hook_depth;
assert(hook_depth >= 0);
assert(hook_depth >= 0);
return TC_CONTINUE;
}
return TC_CONTINUE;
}
void SetHookDepth(int hd) { hook_depth = hd; }
void SetHookDepth(int hd) { hook_depth = hd; }
bool IsValid() const { return valid_script; }
bool IsValid() const { return valid_script; }
private:
bool StmtIsRelevant(const Stmt* stmt)
{
StmtTag tag = stmt->Tag();
return tag == STMT_FOR || tag == STMT_WHILE || tag == STMT_SWITCH || tag == STMT_BREAK ||
tag == STMT_NEXT;
}
bool StmtIsRelevant(const Stmt* stmt) {
StmtTag tag = stmt->Tag();
return tag == STMT_FOR || tag == STMT_WHILE || tag == STMT_SWITCH || tag == STMT_BREAK || tag == STMT_NEXT;
}
bool BreakStmtIsValid()
{
return hook_depth > 0 || stmt_depths[STMT_FOR] > 0 || stmt_depths[STMT_WHILE] > 0 ||
stmt_depths[STMT_SWITCH] > 0;
}
bool BreakStmtIsValid() {
return hook_depth > 0 || stmt_depths[STMT_FOR] > 0 || stmt_depths[STMT_WHILE] > 0 ||
stmt_depths[STMT_SWITCH] > 0;
}
bool NextStmtIsValid() { return stmt_depths[STMT_FOR] > 0 || stmt_depths[STMT_WHILE] > 0; }
bool NextStmtIsValid() { return stmt_depths[STMT_FOR] > 0 || stmt_depths[STMT_WHILE] > 0; }
void Report(const Stmt* stmt, const char* msg)
{
if ( report )
Error(stmt, msg);
void Report(const Stmt* stmt, const char* msg) {
if ( report )
Error(stmt, msg);
valid_script = false;
}
valid_script = false;
}
std::unordered_map<StmtTag, int> stmt_depths;
int hook_depth = 0;
bool report; // whether to report problems via "reporter"
bool valid_script = true;
};
std::unordered_map<StmtTag, int> stmt_depths;
int hook_depth = 0;
bool report; // whether to report problems via "reporter"
bool valid_script = true;
};
void script_validation()
{
BreakNextScriptValidation bn_cb(true);
traverse_all(&bn_cb);
}
void script_validation() {
BreakNextScriptValidation bn_cb(true);
traverse_all(&bn_cb);
}
bool script_is_valid(const Stmt* stmt, bool is_in_hook)
{
BreakNextScriptValidation bn_cb(false);
bool script_is_valid(const Stmt* stmt, bool is_in_hook) {
BreakNextScriptValidation bn_cb(false);
if ( is_in_hook )
bn_cb.SetHookDepth(1);
if ( is_in_hook )
bn_cb.SetHookDepth(1);
stmt->Traverse(&bn_cb);
stmt->Traverse(&bn_cb);
return bn_cb.IsValid();
}
return bn_cb.IsValid();
}
}
} // namespace zeek::detail