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

Deprecant ListVal::Append(Val*) and add IntrusivePtr version

Browse source
This commit is contained in:
Jon Siwek 2020-05-05 11:36:35 -07:00
parent df65d1e829
commit b422f68b88
9 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Expr.cc
View file

@ -3830,13 +3830,13 @@ IntrusivePtr<Val> FlattenExpr::Fold(Val* v) const
{
if ( Val* fv = rv->Lookup(i) )
{
l->Append(fv->Ref());
l->Append({NewRef{}, fv});
continue;
}
const RecordType* rv_t = rv->Type()->AsRecordType();
if ( const Attr* fa = rv_t->FieldDecl(i)->FindAttr(ATTR_DEFAULT) )
l->Append(fa->AttrExpr()->Eval(nullptr).release());
l->Append(fa->AttrExpr()->Eval(nullptr));
else
RuntimeError("missing field value");
@ -4478,7 +4478,7 @@ IntrusivePtr<Val> ListExpr::Eval(Frame* f) const
return nullptr;
}
v->Append(ev.release());
v->Append(std::move(ev));
}
return v;
@ -4570,7 +4570,7 @@ IntrusivePtr<Val> ListExpr::InitVal(const BroType* t, IntrusivePtr<Val> aggr) co
if ( ! vi )
return nullptr;
v->Append(vi.release());
v->Append(std::move(vi));
}
return v;
@ -4601,7 +4601,7 @@ IntrusivePtr<Val> ListExpr::InitVal(const BroType* t, IntrusivePtr<Val> aggr) co
if ( ! vi )
return nullptr;
v->Append(vi.release());
v->Append(std::move(vi));
}
return v;