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

Merge remote-tracking branch 'origin/topic/timw/174-duplicate-attributes'

Browse source 
- Replaced "tag" with "attribute" in the error message since the former
  is not exactly the same concept/meaning and also not user-facing
  terminology

* origin/topic/timw/174-duplicate-attributes:
  Allow duplicate attributes in full redefs
  Short-circuit checking of whether attr exists
  Expanded check for other tag types, fixed btest to cover more tags
  GH-174: Add warning for duplicate attributes
This commit is contained in:
Jon Siwek 2020-08-31 17:31:21 -07:00
commit 5e6bb843ab
10 changed files with 65 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Var.cc
View file

@ -207,7 +207,7 @@ static void make_var(const IDPtr& id, TypePtr t, InitClass c, ExprPtr init,
id->SetType(t);
if ( attr )
id->AddAttrs(make_intrusive<Attributes>(std::move(*attr), t, false, id->IsGlobal()));
id->AddAttrs(make_intrusive<Attributes>(std::move(*attr), t, false, id->IsGlobal()), dt == VAR_REDEF);
if ( init )
{