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

Allow duplicate attributes in full redefs

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-28 09:55:40 -07:00
parent 9b2f26c0aa
commit 9106f3f722
5 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Attr.cc
View file

@ -193,7 +193,7 @@ Attributes::Attributes(std::vector<AttrPtr> a,
AddAttr(std::move(attr));
}
void Attributes::AddAttr(AttrPtr attr)
void Attributes::AddAttr(AttrPtr attr, bool is_redef)
{
auto acceptable_duplicate_tag = [&](const AttrPtr& attr, const AttrPtr& existing) -> bool
{
@ -216,9 +216,12 @@ 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.
auto existing = Find(attr->Tag());
if ( existing && ! acceptable_duplicate_tag(attr, existing) )
reporter->Error("Duplicate %s tag is ambiguous", attr_name(attr->Tag()));
if ( ! is_redef )
{
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.
RemoveAttr(attr->Tag());
@ -249,16 +252,16 @@ void Attributes::AddAttr(AttrPtr attr)
}
}
void Attributes::AddAttrs(const AttributesPtr& a)
void Attributes::AddAttrs(const AttributesPtr& a, bool is_redef)
{
for ( const auto& attr : a->GetAttrs() )
AddAttr(attr);
AddAttr(attr, is_redef);
}
void Attributes::AddAttrs(Attributes* a)
void Attributes::AddAttrs(Attributes* a, bool is_redef)
{
for ( const auto& attr : a->GetAttrs() )
AddAttr(attr);
AddAttr(attr, is_redef);
Unref(a);
}