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

Deprecate Expr::Type(), replace with GetType()

Browse source
This commit is contained in:
Jon Siwek 2020-05-11 13:09:01 -07:00
parent 1eb723fc9d
commit e3f7b38890
8 changed files with 248 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Val.cc
View file

@ -1483,7 +1483,7 @@ void TableVal::CheckExpireAttr(attr_tag at)
{
expire_time = {NewRef{}, a->AttrExpr()};
if ( expire_time->Type()->Tag() != TYPE_INTERVAL )
if ( expire_time->GetType()->Tag() != TYPE_INTERVAL )
{
if ( ! expire_time->IsError() )
expire_time->SetError("expiration interval has wrong type");
@ -1807,10 +1807,10 @@ IntrusivePtr<Val> TableVal::Default(Val* index)
if ( ! def_val )
{
const auto& ytype = GetType()->Yield();
BroType* dtype = def_attr->AttrExpr()->Type();
const auto& dtype = def_attr->AttrExpr()->GetType();
if ( dtype->Tag() == TYPE_RECORD && ytype->Tag() == TYPE_RECORD &&
! same_type(dtype, ytype.get()) &&
! same_type(dtype.get(), ytype.get()) &&
record_promotion_compatible(dtype->AsRecordType(),
ytype->AsRecordType()) )
{
@ -2303,10 +2303,10 @@ void TableVal::InitDefaultFunc(Frame* f)
return;
const auto& ytype = GetType()->Yield();
BroType* dtype = def_attr->AttrExpr()->Type();
const auto& dtype = def_attr->AttrExpr()->GetType();
if ( dtype->Tag() == TYPE_RECORD && ytype->Tag() == TYPE_RECORD &&
! same_type(dtype, ytype.get()) &&
! same_type(dtype.get(), ytype.get()) &&
record_promotion_compatible(dtype->AsRecordType(),
ytype->AsRecordType()) )
return; // TableVal::Default will handle this.