mirror of
https://github.com/zeek/zeek.git
synced 2025-10-15 13:08:20 +00:00
Reformat Zeek in Spicy style
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
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
303
src/Scope.cc
303
src/Scope.cc
|
|
@ -11,218 +11,181 @@
|
|||
#include "zeek/Val.h"
|
||||
#include "zeek/module_util.h"
|
||||
|
||||
namespace zeek::detail
|
||||
{
|
||||
namespace zeek::detail {
|
||||
|
||||
static std::vector<ScopePtr> scopes;
|
||||
static ScopePtr top_scope;
|
||||
|
||||
Scope::Scope(IDPtr id, std::unique_ptr<std::vector<AttrPtr>> al)
|
||||
: scope_id(std::move(id)), attrs(std::move(al))
|
||||
{
|
||||
return_type = nullptr;
|
||||
Scope::Scope(IDPtr id, std::unique_ptr<std::vector<AttrPtr>> al) : scope_id(std::move(id)), attrs(std::move(al)) {
|
||||
return_type = nullptr;
|
||||
|
||||
if ( scope_id )
|
||||
{
|
||||
const auto& id_type = scope_id->GetType();
|
||||
if ( scope_id ) {
|
||||
const auto& id_type = scope_id->GetType();
|
||||
|
||||
if ( id_type->Tag() == TYPE_ERROR )
|
||||
return;
|
||||
else if ( id_type->Tag() != TYPE_FUNC )
|
||||
reporter->InternalError("bad scope id");
|
||||
if ( id_type->Tag() == TYPE_ERROR )
|
||||
return;
|
||||
else if ( id_type->Tag() != TYPE_FUNC )
|
||||
reporter->InternalError("bad scope id");
|
||||
|
||||
FuncType* ft = scope_id->GetType()->AsFuncType();
|
||||
return_type = ft->Yield();
|
||||
}
|
||||
}
|
||||
FuncType* ft = scope_id->GetType()->AsFuncType();
|
||||
return_type = ft->Yield();
|
||||
}
|
||||
}
|
||||
|
||||
const IDPtr& Scope::Find(std::string_view name) const
|
||||
{
|
||||
auto entry = local.find(name);
|
||||
const IDPtr& Scope::Find(std::string_view name) const {
|
||||
auto entry = local.find(name);
|
||||
|
||||
if ( entry != local.end() )
|
||||
return entry->second;
|
||||
if ( entry != local.end() )
|
||||
return entry->second;
|
||||
|
||||
return ID::nil;
|
||||
}
|
||||
return ID::nil;
|
||||
}
|
||||
|
||||
IDPtr Scope::GenerateTemporary(const char* name)
|
||||
{
|
||||
return make_intrusive<ID>(name, SCOPE_FUNCTION, false);
|
||||
}
|
||||
IDPtr Scope::GenerateTemporary(const char* name) { return make_intrusive<ID>(name, SCOPE_FUNCTION, false); }
|
||||
|
||||
std::vector<IDPtr> Scope::GetInits()
|
||||
{
|
||||
auto rval = std::move(inits);
|
||||
inits = {};
|
||||
return rval;
|
||||
}
|
||||
std::vector<IDPtr> Scope::GetInits() {
|
||||
auto rval = std::move(inits);
|
||||
inits = {};
|
||||
return rval;
|
||||
}
|
||||
|
||||
void Scope::Describe(ODesc* d) const
|
||||
{
|
||||
if ( d->IsReadable() )
|
||||
d->AddSP("scope");
|
||||
void Scope::Describe(ODesc* d) const {
|
||||
if ( d->IsReadable() )
|
||||
d->AddSP("scope");
|
||||
|
||||
else
|
||||
{
|
||||
d->Add(scope_id != nullptr);
|
||||
d->SP();
|
||||
d->Add(return_type != nullptr);
|
||||
d->SP();
|
||||
d->Add(static_cast<uint64_t>(local.size()));
|
||||
d->SP();
|
||||
}
|
||||
else {
|
||||
d->Add(scope_id != nullptr);
|
||||
d->SP();
|
||||
d->Add(return_type != nullptr);
|
||||
d->SP();
|
||||
d->Add(static_cast<uint64_t>(local.size()));
|
||||
d->SP();
|
||||
}
|
||||
|
||||
if ( scope_id )
|
||||
{
|
||||
scope_id->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
if ( scope_id ) {
|
||||
scope_id->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
|
||||
if ( return_type )
|
||||
{
|
||||
return_type->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
if ( return_type ) {
|
||||
return_type->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
|
||||
for ( const auto& entry : local )
|
||||
{
|
||||
ID* id = entry.second.get();
|
||||
id->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
}
|
||||
for ( const auto& entry : local ) {
|
||||
ID* id = entry.second.get();
|
||||
id->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
}
|
||||
|
||||
TraversalCode Scope::Traverse(TraversalCallback* cb) const
|
||||
{
|
||||
for ( const auto& entry : local )
|
||||
{
|
||||
ID* id = entry.second.get();
|
||||
TraversalCode tc = id->Traverse(cb);
|
||||
HANDLE_TC_STMT_PRE(tc);
|
||||
}
|
||||
TraversalCode Scope::Traverse(TraversalCallback* cb) const {
|
||||
for ( const auto& entry : local ) {
|
||||
ID* id = entry.second.get();
|
||||
TraversalCode tc = id->Traverse(cb);
|
||||
HANDLE_TC_STMT_PRE(tc);
|
||||
}
|
||||
|
||||
return TC_CONTINUE;
|
||||
}
|
||||
return TC_CONTINUE;
|
||||
}
|
||||
|
||||
const IDPtr& lookup_ID(const char* name, const char* curr_module, bool no_global,
|
||||
bool same_module_only, bool check_export)
|
||||
{
|
||||
bool explicit_global = zeek::util::starts_with(name, "::");
|
||||
const IDPtr& lookup_ID(const char* name, const char* curr_module, bool no_global, bool same_module_only,
|
||||
bool check_export) {
|
||||
bool explicit_global = zeek::util::starts_with(name, "::");
|
||||
|
||||
// Ad-hoc deprecation if a name starts with "GLOBAL::". In v7.1 we could
|
||||
// tweak {ID} to reject GLOBAL::, or switch this warning to error instead.
|
||||
static std::string deprecated_prefix = util::fmt("%s::", GLOBAL_MODULE_NAME);
|
||||
if ( zeek::util::starts_with(name, deprecated_prefix) )
|
||||
reporter->Deprecation(util::fmt("Remove in v7.1: Use :: instead of %s (%s)",
|
||||
deprecated_prefix.c_str(), name));
|
||||
// Ad-hoc deprecation if a name starts with "GLOBAL::". In v7.1 we could
|
||||
// tweak {ID} to reject GLOBAL::, or switch this warning to error instead.
|
||||
static std::string deprecated_prefix = util::fmt("%s::", GLOBAL_MODULE_NAME);
|
||||
if ( zeek::util::starts_with(name, deprecated_prefix) )
|
||||
reporter->Deprecation(util::fmt("Remove in v7.1: Use :: instead of %s (%s)", deprecated_prefix.c_str(), name));
|
||||
|
||||
std::string fullname = make_full_var_name(curr_module, name);
|
||||
std::string ID_module = extract_module_name(fullname.c_str());
|
||||
std::string fullname = make_full_var_name(curr_module, name);
|
||||
std::string ID_module = extract_module_name(fullname.c_str());
|
||||
|
||||
// This is mostly for sanity (and should be covered by syntax)
|
||||
if ( explicit_global && same_module_only && ID_module != GLOBAL_MODULE_NAME )
|
||||
{
|
||||
reporter->Error("lookup_ID for %s with :: prefix for non-global module called", name);
|
||||
return ID::nil;
|
||||
}
|
||||
// This is mostly for sanity (and should be covered by syntax)
|
||||
if ( explicit_global && same_module_only && ID_module != GLOBAL_MODULE_NAME ) {
|
||||
reporter->Error("lookup_ID for %s with :: prefix for non-global module called", name);
|
||||
return ID::nil;
|
||||
}
|
||||
|
||||
if ( explicit_global && no_global )
|
||||
{
|
||||
reporter->Error("lookup_ID for %s with :: prefix, but no_global=true", name);
|
||||
return ID::nil;
|
||||
}
|
||||
if ( explicit_global && no_global ) {
|
||||
reporter->Error("lookup_ID for %s with :: prefix, but no_global=true", name);
|
||||
return ID::nil;
|
||||
}
|
||||
|
||||
if ( ! explicit_global )
|
||||
{
|
||||
bool need_export = check_export &&
|
||||
(ID_module != GLOBAL_MODULE_NAME && ID_module != curr_module);
|
||||
if ( ! explicit_global ) {
|
||||
bool need_export = check_export && (ID_module != GLOBAL_MODULE_NAME && ID_module != curr_module);
|
||||
|
||||
for ( auto s_i = scopes.rbegin(); s_i != scopes.rend(); ++s_i )
|
||||
{
|
||||
const auto& id = (*s_i)->Find(fullname);
|
||||
for ( auto s_i = scopes.rbegin(); s_i != scopes.rend(); ++s_i ) {
|
||||
const auto& id = (*s_i)->Find(fullname);
|
||||
|
||||
if ( id )
|
||||
{
|
||||
if ( need_export && ! id->IsExport() && ! in_debug )
|
||||
reporter->Error("identifier is not exported: %s", fullname.c_str());
|
||||
if ( id ) {
|
||||
if ( need_export && ! id->IsExport() && ! in_debug )
|
||||
reporter->Error("identifier is not exported: %s", fullname.c_str());
|
||||
|
||||
return id;
|
||||
}
|
||||
}
|
||||
}
|
||||
return id;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! no_global && (strcmp(GLOBAL_MODULE_NAME, curr_module) == 0 || ! same_module_only) )
|
||||
{
|
||||
std::string globalname = make_full_var_name(GLOBAL_MODULE_NAME, name);
|
||||
return global_scope()->Find(globalname);
|
||||
}
|
||||
if ( ! no_global && (strcmp(GLOBAL_MODULE_NAME, curr_module) == 0 || ! same_module_only) ) {
|
||||
std::string globalname = make_full_var_name(GLOBAL_MODULE_NAME, name);
|
||||
return global_scope()->Find(globalname);
|
||||
}
|
||||
|
||||
return ID::nil;
|
||||
}
|
||||
return ID::nil;
|
||||
}
|
||||
|
||||
IDPtr install_ID(const char* name, const char* module_name, bool is_global, bool is_export)
|
||||
{
|
||||
if ( scopes.empty() && ! is_global )
|
||||
reporter->InternalError("local identifier in global scope");
|
||||
IDPtr install_ID(const char* name, const char* module_name, bool is_global, bool is_export) {
|
||||
if ( scopes.empty() && ! is_global )
|
||||
reporter->InternalError("local identifier in global scope");
|
||||
|
||||
IDScope scope;
|
||||
if ( is_export || ! module_name ||
|
||||
(is_global && normalized_module_name(module_name) == GLOBAL_MODULE_NAME) )
|
||||
scope = SCOPE_GLOBAL;
|
||||
else if ( is_global )
|
||||
scope = SCOPE_MODULE;
|
||||
else
|
||||
scope = SCOPE_FUNCTION;
|
||||
IDScope scope;
|
||||
if ( is_export || ! module_name || (is_global && normalized_module_name(module_name) == GLOBAL_MODULE_NAME) )
|
||||
scope = SCOPE_GLOBAL;
|
||||
else if ( is_global )
|
||||
scope = SCOPE_MODULE;
|
||||
else
|
||||
scope = SCOPE_FUNCTION;
|
||||
|
||||
std::string full_name = make_full_var_name(module_name, name);
|
||||
std::string full_name = make_full_var_name(module_name, name);
|
||||
|
||||
auto id = make_intrusive<ID>(full_name.data(), scope, is_export);
|
||||
auto id = make_intrusive<ID>(full_name.data(), scope, is_export);
|
||||
|
||||
if ( SCOPE_FUNCTION != scope )
|
||||
global_scope()->Insert(std::move(full_name), id);
|
||||
else
|
||||
{
|
||||
id->SetOffset(top_scope->Length());
|
||||
top_scope->Insert(std::move(full_name), id);
|
||||
}
|
||||
if ( SCOPE_FUNCTION != scope )
|
||||
global_scope()->Insert(std::move(full_name), id);
|
||||
else {
|
||||
id->SetOffset(top_scope->Length());
|
||||
top_scope->Insert(std::move(full_name), id);
|
||||
}
|
||||
|
||||
return id;
|
||||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
void push_existing_scope(ScopePtr scope)
|
||||
{
|
||||
top_scope = scope;
|
||||
scopes.push_back(scope);
|
||||
}
|
||||
void push_existing_scope(ScopePtr scope) {
|
||||
top_scope = scope;
|
||||
scopes.push_back(scope);
|
||||
}
|
||||
|
||||
void push_scope(IDPtr id, std::unique_ptr<std::vector<AttrPtr>> attrs)
|
||||
{
|
||||
top_scope = make_intrusive<Scope>(std::move(id), std::move(attrs));
|
||||
scopes.push_back(top_scope);
|
||||
}
|
||||
void push_scope(IDPtr id, std::unique_ptr<std::vector<AttrPtr>> attrs) {
|
||||
top_scope = make_intrusive<Scope>(std::move(id), std::move(attrs));
|
||||
scopes.push_back(top_scope);
|
||||
}
|
||||
|
||||
ScopePtr pop_scope()
|
||||
{
|
||||
if ( scopes.empty() )
|
||||
reporter->InternalError("scope underflow");
|
||||
scopes.pop_back();
|
||||
ScopePtr pop_scope() {
|
||||
if ( scopes.empty() )
|
||||
reporter->InternalError("scope underflow");
|
||||
scopes.pop_back();
|
||||
|
||||
auto old_top = top_scope;
|
||||
auto old_top = top_scope;
|
||||
|
||||
top_scope = scopes.empty() ? nullptr : scopes.back();
|
||||
top_scope = scopes.empty() ? nullptr : scopes.back();
|
||||
|
||||
return old_top;
|
||||
}
|
||||
return old_top;
|
||||
}
|
||||
|
||||
ScopePtr current_scope()
|
||||
{
|
||||
return top_scope;
|
||||
}
|
||||
ScopePtr current_scope() { return top_scope; }
|
||||
|
||||
ScopePtr global_scope()
|
||||
{
|
||||
return scopes.empty() ? 0 : scopes.front();
|
||||
}
|
||||
ScopePtr global_scope() { return scopes.empty() ? 0 : scopes.front(); }
|
||||
|
||||
} // namespace zeek::detail
|
||||
} // namespace zeek::detail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue