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

Switch deprecations to reporter->Deprecation()

Browse source 
Removes a bit of reliance around the magic DoLog() rendering at the
cost of needing to open-code some of it. The new obj_desc_short()
helper makes that acceptable, though.
This commit is contained in:
Arne Welzel 2023-03-21 21:36:34 +01:00
parent 2f93592c6f
commit 384b4de764
5 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Var.cc
View file

@ -6,6 +6,7 @@
#include <memory>
#include "zeek/Desc.h"
#include "zeek/EventRegistry.h"
#include "zeek/Expr.h"
#include "zeek/Func.h"
@ -194,7 +195,10 @@ static void make_var(const IDPtr& id, TypePtr t, InitClass c, ExprPtr init,
// This can happen because the grammar allows any "init_class",
// including none, to be followed by an expression.
// Remove in v6.1 (make an error)
init->Warn("Remove in v6.1. Initialization not preceded by =/+=/-= is deprecated.");
reporter->Deprecation(
util::fmt("Remove in v6.1. Initialization not preceded by =/+=/-= is deprecated. (%s)",
obj_desc_short(init.get()).c_str()),
init->GetLocationInfo());
// The historical instances of these, such as the
// language/redef-same-prefixtable-idx.zeek btest, treat
@ -537,14 +541,13 @@ static std::optional<FuncType::Prototype> func_type_check(const FuncType* decl,
{
auto msg = ad->DeprecationMessage();
if ( msg.empty() )
impl->Warn(
util::fmt("use of deprecated parameter '%s'", rval->args->FieldName(i)),
decl, true);
else
impl->Warn(util::fmt("use of deprecated parameter '%s': %s",
rval->args->FieldName(i), msg.data()),
decl, true);
if ( ! msg.empty() )
msg = ": " + msg;
reporter->Deprecation(util::fmt("use of deprecated parameter '%s'%s (%s)",
rval->args->FieldName(i), msg.data(),
obj_desc_short(impl).c_str()),
impl->GetLocationInfo(), decl->GetLocationInfo());
}
return rval;
@ -605,13 +608,13 @@ static auto get_prototype(IDPtr id, FuncTypePtr t)
if ( prototype->deprecated )
{
if ( prototype->deprecation_msg.empty() )
t->Warn(util::fmt("use of deprecated '%s' prototype", id->Name()),
prototype->args.get(), true);
else
t->Warn(util::fmt("use of deprecated '%s' prototype: %s", id->Name(),
prototype->deprecation_msg.data()),
prototype->args.get(), true);
auto msg = prototype->deprecation_msg;
if ( ! msg.empty() )
msg = ": " + msg;
reporter->Deprecation(util::fmt("use of deprecated '%s' prototype%s (%s)", id->Name(),
msg.c_str(), obj_desc_short(t.get()).c_str()),
t->GetLocationInfo(), prototype->args->GetLocationInfo());
}
}