Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify some IntrusivePtr operations in Expr::Duplicate/Inline

Browse source
This commit is contained in:
Jon Siwek 2020-12-13 14:20:10 -08:00
parent 70ff4ef678
commit fa418cb179
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/script_opt/Expr.cc
View file

@ -320,27 +320,21 @@ ExprPtr ArithCoerceExpr::Duplicate()
ExprPtr RecordCoerceExpr::Duplicate()
{
auto op_dup = op->Duplicate();
auto rt = GetType()->AsRecordType();
RecordTypePtr rt_p = {NewRef{}, rt};
return SetSucc(new RecordCoerceExpr(op_dup, rt_p));
return SetSucc(new RecordCoerceExpr(op_dup, GetType<RecordType>()));
}
ExprPtr TableCoerceExpr::Duplicate()
{
auto op_dup = op->Duplicate();
auto tt = GetType()->AsTableType();
TableTypePtr tt_p = {NewRef{}, tt};
return SetSucc(new TableCoerceExpr(op_dup, tt_p));
return SetSucc(new TableCoerceExpr(op_dup, GetType<TableType>()));
}
ExprPtr VectorCoerceExpr::Duplicate()
{
auto op_dup = op->Duplicate();
auto vt = GetType()->AsVectorType();
VectorTypePtr vt_p = {NewRef{}, vt};
return SetSucc(new VectorCoerceExpr(op_dup, vt_p));
return SetSucc(new VectorCoerceExpr(op_dup, GetType<VectorType>()));
}
@ -387,9 +381,7 @@ ExprPtr CallExpr::Inline(Inliner* inl)
// We're not inlining, but perhaps our elements should be.
func = func->Inline(inl);
auto new_args = args->Inline(inl);
args = {NewRef{}, new_args->AsListExpr()};
args = cast_intrusive<ListExpr>(args->Inline(inl));
return ThisPtr();
}
@ -417,9 +409,7 @@ ExprPtr EventExpr::Duplicate()
ExprPtr EventExpr::Inline(Inliner* inl)
{
auto el = args->Inline(inl)->AsListExpr();
args = {NewRef{}, el};
args = cast_intrusive<ListExpr>(args->Inline(inl));
return ThisPtr();
}