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

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

12
src/Val.cc
View file

@ -275,7 +275,7 @@ IntrusivePtr<Val> Val::SizeVal() const
case zeek::TYPE_INTERNAL_OTHER:
if ( type->Tag() == zeek::TYPE_FUNC )
return val_mgr->Count(val.func_val->GetType()->ParamList()->Types().size());
return val_mgr->Count(val.func_val->GetType()->ParamList()->GetTypes().size());
if ( type->Tag() == zeek::TYPE_FILE )
return make_intrusive<DoubleVal>(val.file_val->Size());
@ -1357,7 +1357,7 @@ static void find_nested_record_types(const IntrusivePtr<zeek::Type>& t, std::set
return;
case zeek::TYPE_LIST:
{
for ( const auto& type : t->AsTypeList()->Types() )
for ( const auto& type : t->AsTypeList()->GetTypes() )
find_nested_record_types(type, found);
}
return;
@ -1384,7 +1384,7 @@ TableVal::TableVal(IntrusivePtr<zeek::TableType> t, IntrusivePtr<zeek::detail::A
if ( ! is_parsing )
return;
for ( const auto& t : table_type->IndexTypes() )
for ( const auto& t : table_type->GetIndexTypes() )
{
std::set<zeek::RecordType*> found;
// TODO: this likely doesn't have to be repeated for each new TableVal,
@ -1770,7 +1770,7 @@ bool TableVal::ExpandAndInit(IntrusivePtr<Val> index, IntrusivePtr<Val> new_val)
ListVal* iv = index->AsListVal();
if ( iv->BaseTag() != zeek::TYPE_ANY )
{
if ( table_type->GetIndices()->Types().size() != 1 )
if ( table_type->GetIndices()->GetTypes().size() != 1 )
reporter->InternalError("bad singleton list index");
for ( int i = 0; i < iv->Length(); ++i )
@ -2179,7 +2179,7 @@ ListVal* TableVal::ConvertToList(zeek::TypeTag t) const
IntrusivePtr<ListVal> TableVal::ToPureListVal() const
{
const auto& tl = table_type->GetIndices()->Types();
const auto& tl = table_type->GetIndices()->GetTypes();
if ( tl.size() != 1 )
{
InternalWarning("bad index type in TableVal::ToPureListVal");
@ -2515,7 +2515,7 @@ double TableVal::CallExpireFunc(IntrusivePtr<ListVal> idx)
const Func* f = vf->AsFunc();
zeek::Args vl;
const auto& func_args = f->GetType()->ParamList()->Types();
const auto& func_args = f->GetType()->ParamList()->GetTypes();
// backwards compatibility with idx: any idiom
bool any_idiom = func_args.size() == 2 && func_args.back()->Tag() == zeek::TYPE_ANY;