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

Move Attr to the zeek::detail namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-19 16:06:37 -07:00
parent 54233ce596
commit 60ed29c3b6
21 changed files with 249 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/Attr.cc
View file

@ -9,6 +9,8 @@
#include "IntrusivePtr.h"
#include "threading/SerialTypes.h"
namespace zeek::detail {
const char* attr_name(attr_tag t)
{
static const char* attr_names[int(NUM_ATTRS)] = {
@ -23,18 +25,26 @@ const char* attr_name(attr_tag t)
return attr_names[int(t)];
}
Attr::Attr(attr_tag t, IntrusivePtr<zeek::detail::Expr> e)
Attr::Attr(attr_tag t, IntrusivePtr<Expr> e)
: expr(std::move(e))
{
tag = t;
SetLocationInfo(&start_location, &end_location);
}
Attr::Attr(::attr_tag t, IntrusivePtr<Expr> e) : Attr(static_cast<attr_tag>(t), e)
{
}
Attr::Attr(attr_tag t)
: Attr(t, nullptr)
{
}
Attr::Attr(::attr_tag t) : Attr(static_cast<attr_tag>(t))
{
}
Attr::~Attr() = default;
void Attr::SetAttrExpr(IntrusivePtr<zeek::detail::Expr> e)
@ -90,7 +100,7 @@ void Attr::DescribeReST(ODesc* d, bool shorten) const
d->Add("=");
d->SP();
if ( expr->Tag() == zeek::detail::EXPR_NAME )
if ( expr->Tag() == EXPR_NAME )
{
d->Add(":zeek:see:`");
expr->Describe(d);
@ -104,7 +114,7 @@ void Attr::DescribeReST(ODesc* d, bool shorten) const
d->Add("`");
}
else if ( expr->Tag() == zeek::detail::EXPR_CONST )
else if ( expr->Tag() == EXPR_CONST )
{
ODesc dd;
dd.SetQuotes(true);
@ -233,6 +243,11 @@ const IntrusivePtr<Attr>& Attributes::Find(attr_tag t) const
return Attr::nil;
}
Attr* Attributes::FindAttr(::attr_tag t) const
{
return FindAttr(static_cast<attr_tag>(t));
}
void Attributes::RemoveAttr(attr_tag t)
{
for ( auto it = attrs.begin(); it != attrs.end(); )
@ -244,6 +259,11 @@ void Attributes::RemoveAttr(attr_tag t)
}
}
void Attributes::RemoveAttr(::attr_tag t)
{
RemoveAttr(static_cast<attr_tag>(t));
}
void Attributes::Describe(ODesc* d) const
{
if ( attrs.empty() )
@ -663,3 +683,5 @@ bool Attributes::operator==(const Attributes& other) const
return true;
}
}