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

Deprecate ID::AsType(), add ID::IsType() and ID::GetType()

Browse source
This commit is contained in:
Jon Siwek 2020-05-07 20:07:46 -07:00
parent f26904e031
commit 6e647416d5
10 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Expr.cc
View file

@ -218,8 +218,8 @@ NameExpr::NameExpr(IntrusivePtr<ID> arg_id, bool const_init)
{
in_const_init = const_init;
if ( id->AsType() )
SetType(make_intrusive<TypeType>(IntrusivePtr{NewRef{}, id->AsType()}));
if ( id->IsType() )
SetType(make_intrusive<TypeType>(IntrusivePtr{NewRef{}, id->Type()}));
else
SetType({NewRef{}, id->Type()});
@ -232,8 +232,8 @@ IntrusivePtr<Val> NameExpr::Eval(Frame* f) const
{
IntrusivePtr<Val> v;
if ( id->AsType() )
return make_intrusive<Val>(id->AsType(), true);
if ( id->IsType() )
return make_intrusive<Val>(id->Type(), true);
if ( id->IsGlobal() )
v = {NewRef{}, id->ID_Val()};
@ -256,7 +256,7 @@ IntrusivePtr<Val> NameExpr::Eval(Frame* f) const
IntrusivePtr<Expr> NameExpr::MakeLvalue()
{
if ( id->AsType() )
if ( id->IsType() )
ExprError("Type name is not an lvalue");
if ( id->IsConst() && ! in_const_init )