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

Remove check for redundant attributes

Browse source 
Letting there be redundant attributes serves no purpose.  It could
also potentially cause long attribute lists containing many useless
&redef or &optional attributes (e.g. think that may happen if you
use redef enough times and the new attributes keep getting merged
into the old ones).
This commit is contained in:
Jon Siwek 2019-10-15 17:39:06 -07:00
parent 5265613a9e
commit 1a0a2f16ce
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc

@ -1 +1 @@
Subproject commit 47138ec29f404825122d749d4ebb5dd5b32338db
Subproject commit e71c2a656358aa88d053d424d7c726ad5b2ce88a

2
src/Attr.cc
View file

@ -164,10 +164,8 @@ void Attributes::AddAttr(Attr* attr)
if ( ! attrs )
attrs = new attr_list(1);
if ( ! attr->RedundantAttrOkay() )
// We overwrite old attributes by deleting them first.
RemoveAttr(attr->Tag());
attrs->push_back(attr);
Ref(attr);

3
src/Attr.h
View file

@ -46,9 +46,6 @@ public:
// previous expr as the new expr depends on it.
void SetAttrExpr(Expr* e) { expr = e; }
int RedundantAttrOkay() const
{ return tag == ATTR_REDEF || tag == ATTR_OPTIONAL; }
void Describe(ODesc* d) const override;
void DescribeReST(ODesc* d, bool shorten = false) const;