Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Short-circuit checking of whether attr exists

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-28 09:37:36 -07:00
parent 36e3ab7177
commit 9b2f26c0aa
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Attr.cc
View file

@ -195,17 +195,14 @@ Attributes::Attributes(std::vector<AttrPtr> a,
void Attributes::AddAttr(AttrPtr attr)
{
auto acceptable_duplicate_tag = [&](AttrPtr attr) -> bool
auto acceptable_duplicate_tag = [&](const AttrPtr& attr, const AttrPtr& existing) -> bool
{
AttrTag new_tag = attr->Tag();
if ( new_tag == ATTR_DEPRECATED )
{
if ( ! attr->DeprecationMessage().empty() )
return false;
auto existing = Find(new_tag);
if ( existing && ! existing->DeprecationMessage().empty() )
if ( ! attr->DeprecationMessage().empty() ||
( existing && ! existing->DeprecationMessage().empty() ) )
return false;
return true;
@ -219,7 +216,8 @@ void Attributes::AddAttr(AttrPtr attr)
// Display a warning for duplicated tags on a type. &log tags are intentionally
// ignored here because duplicate log tags on record types are valid, and don't
// cause any significant breakage for other types.
if ( ! acceptable_duplicate_tag(attr) && Find(attr->Tag()) )
auto existing = Find(attr->Tag());
if ( existing && ! acceptable_duplicate_tag(attr, existing) )
reporter->Error("Duplicate %s tag is ambiguous", attr_name(attr->Tag()));
// We overwrite old attributes by deleting them first.