Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 15:18:20 +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

22
src/Type.h
View file

@ -416,7 +416,13 @@ public:
{
}
const std::vector<IntrusivePtr<Type>>& Types() const
~TypeList() override = default;
[[deprecated("Remove in v4.1. Use GetTypes() instead.")]]
const type_list* Types() const
{ return &types_list; }
const std::vector<IntrusivePtr<Type>>& GetTypes() const
{ return types; }
bool IsPure() const { return pure_type != nullptr; }
@ -448,21 +454,29 @@ public:
protected:
IntrusivePtr<Type> pure_type;
std::vector<IntrusivePtr<Type>> types;
// Remove in v4.1. This is used by Types(), which is deprecated.
type_list types_list;
};
class IndexType : public Type {
public:
int MatchesIndex(zeek::detail::ListExpr* index) const override;
const IntrusivePtr<TypeList>& GetIndices() const
{ return indices; }
[[deprecated("Remove in v4.1. Use GetIndices().")]]
[[deprecated("Remove in v4.1. Use GetIndices().")]]
TypeList* Indices() const { return indices.get(); }
const std::vector<IntrusivePtr<Type>>& IndexTypes() const
[[deprecated("Remove in v4.1. Use GetIndexTypes().")]]
const type_list* IndexTypes() const
{ return indices->Types(); }
const std::vector<IntrusivePtr<Type>>& GetIndexTypes() const
{ return indices->GetTypes(); }
const IntrusivePtr<Type>& Yield() const override
{ return yield_type; }
@ -480,7 +494,7 @@ protected:
{
}
~IndexType() override;
~IndexType() override = default;
IntrusivePtr<TypeList> indices;
IntrusivePtr<Type> yield_type;