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

GH-1034: Revert TypeList::Types() back to return a type_list* and mark it deprecated

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-27 10:41:35 -07:00
parent a5a51de3c4
commit e1338cc379
15 changed files with 82 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Expr.cc
View file

@ -3086,7 +3086,7 @@ TableConstructorExpr::TableConstructorExpr(IntrusivePtr<ListExpr> constructor_li
if ( arg_attrs )
attrs = make_intrusive<Attributes>(std::move(*arg_attrs), type, false, false);
const auto& indices = type->AsTableType()->GetIndices()->Types();
const auto& indices = type->AsTableType()->GetIndices()->GetTypes();
const expr_list& cle = op->AsListExpr()->Exprs();
// check and promote all index expressions in ctor list
@ -3204,7 +3204,7 @@ SetConstructorExpr::SetConstructorExpr(IntrusivePtr<ListExpr> constructor_list,
if ( arg_attrs )
attrs = make_intrusive<Attributes>(std::move(*arg_attrs), type, false, false);
const auto& indices = type->AsTableType()->GetIndices()->Types();
const auto& indices = type->AsTableType()->GetIndices()->GetTypes();
expr_list& cle = op->AsListExpr()->Exprs();
if ( indices.size() == 1 )
@ -4471,7 +4471,7 @@ IntrusivePtr<Val> ListExpr::InitVal(const zeek::Type* t, IntrusivePtr<Val> aggr)
if ( ! aggr && type->AsTypeList()->AllMatch(t, true) )
{
auto v = make_intrusive<ListVal>(zeek::TYPE_ANY);
const auto& tl = type->AsTypeList()->Types();
const auto& tl = type->AsTypeList()->GetTypes();
if ( exprs.length() != static_cast<int>(tl.size()) )
{
@ -4499,7 +4499,7 @@ IntrusivePtr<Val> ListExpr::InitVal(const zeek::Type* t, IntrusivePtr<Val> aggr)
return nullptr;
}
const auto& tl = t->AsTypeList()->Types();
const auto& tl = t->AsTypeList()->GetTypes();
if ( exprs.length() != static_cast<int>(tl.size()) )
{
@ -4620,7 +4620,7 @@ IntrusivePtr<Val> ListExpr::AddSetInit(const zeek::Type* t, IntrusivePtr<Val> ag
else if ( expr->GetType()->Tag() == zeek::TYPE_LIST )
element = expr->InitVal(it, nullptr);
else
element = expr->InitVal(it->Types()[0].get(), nullptr);
element = expr->InitVal(it->GetTypes()[0].get(), nullptr);
if ( ! element )
return nullptr;
@ -4642,7 +4642,7 @@ IntrusivePtr<Val> ListExpr::AddSetInit(const zeek::Type* t, IntrusivePtr<Val> ag
if ( expr->GetType()->Tag() == zeek::TYPE_LIST )
element = check_and_promote(std::move(element), it, true);
else
element = check_and_promote(std::move(element), it->Types()[0].get(), true);
element = check_and_promote(std::move(element), it->GetTypes()[0].get(), true);
if ( ! element )
return nullptr;
@ -4930,7 +4930,7 @@ IntrusivePtr<Expr> check_and_promote_expr(Expr* const e, zeek::Type* t)
bool check_and_promote_exprs(ListExpr* const elements, TypeList* types)
{
expr_list& el = elements->Exprs();
const auto& tl = types->Types();
const auto& tl = types->GetTypes();
if ( tl.size() == 1 && tl[0]->Tag() == zeek::TYPE_ANY )
return true;