Merge remote-tracking branch 'origin/master' into topic/johanna/table-changes

This commit is contained in:
Johanna Amann 2020-07-13 17:11:55 -07:00
commit 7c37226eaa
39 changed files with 714 additions and 251 deletions

View file

@ -42,6 +42,18 @@ Attr::Attr(AttrTag t)
void Attr::SetAttrExpr(ExprPtr e)
{ expr = std::move(e); }
std::string Attr::DeprecationMessage() const
{
if ( tag != ATTR_DEPRECATED )
return "";
if ( ! expr )
return "";
auto ce = static_cast<zeek::detail::ConstExpr*>(expr.get());
return ce->Value()->AsStringVal()->CheckString();
}
void Attr::Describe(ODesc* d) const
{
AddTag(d);