Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support :: prefix to reference global namespace, deprecate GLOBAL::

Browse source 
Closes #2709
This commit is contained in:
Arne Welzel 2023-07-10 14:13:27 +02:00
parent c23ee30542
commit 12a5616f4d
26 changed files with 476 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Scope.cc
View file

@ -108,22 +108,47 @@ TraversalCode Scope::Traverse(TraversalCallback* cb) const
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));
std::string fullname = make_full_var_name(curr_module, name);
std::string ID_module = extract_module_name(fullname.c_str());
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 )
// This is mostly for sanity (and should be covered by syntax)
if ( explicit_global && same_module_only && ID_module != GLOBAL_MODULE_NAME )
{
const auto& id = (*s_i)->Find(fullname);
reporter->Error("lookup_ID for %s with :: prefix for non-global module called", name);
return ID::nil;
}
if ( id )
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);
for ( auto s_i = scopes.rbegin(); s_i != scopes.rend(); ++s_i )
{
if ( need_export && ! id->IsExport() && ! in_debug )
reporter->Error("identifier is not exported: %s", fullname.c_str());
const auto& id = (*s_i)->Find(fullname);
return id;
if ( id )
{
if ( need_export && ! id->IsExport() && ! in_debug )
reporter->Error("identifier is not exported: %s", fullname.c_str());
return id;
}
}
}