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

Merge remote-tracking branch 'origin/topic/timw/3059-set-vector-conversion'

Browse source 
* origin/topic/timw/3059-set-vector-conversion:
  Fix conversion with record types
  Add conversion between set and vector using 'as' keyword
  Add std::move for a couple of variables passed by value
This commit is contained in:
Tim Wojtulewicz 2023-08-11 10:34:52 -07:00
commit e8ef169b27
11 changed files with 206 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Expr.cc
View file

@ -3703,7 +3703,7 @@ void TableConstructorExpr::ExprDescribe(ODesc* d) const
SetConstructorExpr::SetConstructorExpr(ListExprPtr constructor_list,
std::unique_ptr<std::vector<AttrPtr>> arg_attrs,
TypePtr arg_type, AttributesPtr arg_attrs2)
: UnaryExpr(EXPR_SET_CONSTRUCTOR, expand_op(constructor_list, arg_type))
: UnaryExpr(EXPR_SET_CONSTRUCTOR, expand_op(std::move(constructor_list), arg_type))
{
if ( IsError() )
return;
@ -3737,7 +3737,7 @@ SetConstructorExpr::SetConstructorExpr(ListExprPtr constructor_list,
if ( arg_attrs )
SetAttrs(make_intrusive<Attributes>(std::move(*arg_attrs), type, false, false));
else
SetAttrs(arg_attrs2);
SetAttrs(std::move(arg_attrs2));
const auto& indices = type->AsTableType()->GetIndices()->GetTypes();
ExprPList& cle = op->AsListExpr()->Exprs();