Move Reporter to zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-07-20 10:57:36 -07:00
parent 7cedd94ee7
commit bfab224d7c
132 changed files with 1010 additions and 987 deletions

View file

@ -30,7 +30,7 @@ Scope::Scope(zeek::detail::IDPtr id,
if ( id_type->Tag() == zeek::TYPE_ERROR )
return;
else if ( id_type->Tag() != zeek::TYPE_FUNC )
reporter->InternalError("bad scope id");
zeek::reporter->InternalError("bad scope id");
zeek::FuncType* ft = id->GetType()->AsFuncType();
return_type = ft->Yield();
@ -138,8 +138,8 @@ const zeek::detail::IDPtr& lookup_ID(const char* name, const char* curr_module,
if ( id )
{
if ( need_export && ! id->IsExport() && ! in_debug )
reporter->Error("identifier is not exported: %s",
fullname.c_str());
zeek::reporter->Error("identifier is not exported: %s",
fullname.c_str());
return id;
}
@ -159,7 +159,7 @@ zeek::detail::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");
zeek::reporter->InternalError("local identifier in global scope");
zeek::detail::IDScope scope;
if ( is_export || ! module_name ||
@ -201,7 +201,7 @@ void push_scope(zeek::detail::IDPtr id,
ScopePtr pop_scope()
{
if ( scopes.empty() )
reporter->InternalError("scope underflow");
zeek::reporter->InternalError("scope underflow");
scopes.pop_back();
Scope* old_top = top_scope;