Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 07:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Deprecate TypeType::Type(), replace with GetType()

Browse source
This commit is contained in:
Jon Siwek 2020-05-21 23:10:21 -07:00
parent 863f02744e
commit a0481c0b26
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Type.h
View file

@ -547,7 +547,13 @@ public:
const IntrusivePtr<BroType>& GetType() const const IntrusivePtr<BroType>& GetType() const
{ return type; } { return type; }
template <class T>
IntrusivePtr<T> GetType() const
{ return cast_intrusive<T>(type); }
[[deprecated("Remove in v4.1. Use GetType().")]]
BroType* Type() { return type.get(); } BroType* Type() { return type.get(); }
[[deprecated("Remove in v4.1. Use GetType().")]]
const BroType* Type() const { return type.get(); } const BroType* Type() const { return type.get(); }
protected: protected:

6
src/Val.cc
View file

@ -347,7 +347,7 @@ void Val::ValDescribe(ODesc* d) const
else if ( type->Tag() == TYPE_FILE ) else if ( type->Tag() == TYPE_FILE )
AsFile()->Describe(d); AsFile()->Describe(d);
else if ( type->Tag() == TYPE_TYPE ) else if ( type->Tag() == TYPE_TYPE )
d->Add(type->AsTypeType()->Type()->GetName()); d->Add(type->AsTypeType()->GetType()->GetName());
else else
d->Add("<no value description>"); d->Add("<no value description>");
break; break;
@ -440,7 +440,7 @@ IntrusivePtr<TableVal> Val::GetRecordFields()
} }
else else
{ {
t = t->AsTypeType()->Type(); t = t->AsTypeType()->GetType().get();
if ( t->Tag() != TYPE_RECORD ) if ( t->Tag() != TYPE_RECORD )
{ {
@ -1375,7 +1375,7 @@ static void find_nested_record_types(BroType* t, std::set<RecordType*>* found)
find_nested_record_types(t->AsVectorType()->Yield().get(), found); find_nested_record_types(t->AsVectorType()->Yield().get(), found);
return; return;
case TYPE_TYPE: case TYPE_TYPE:
find_nested_record_types(t->AsTypeType()->Type(), found); find_nested_record_types(t->AsTypeType()->GetType().get(), found);
return; return;
default: default:
return; return;

6
src/input/Manager.cc
View file

@ -314,7 +314,7 @@ bool Manager::CreateEventStream(RecordVal* fval)
string stream_name = fval->GetFieldOrDefault("name")->AsString()->CheckString(); string stream_name = fval->GetFieldOrDefault("name")->AsString()->CheckString();
auto fields_val = fval->GetFieldOrDefault("fields"); auto fields_val = fval->GetFieldOrDefault("fields");
RecordType* fields = fields_val->AsType()->AsTypeType()->Type()->AsRecordType(); RecordType* fields = fields_val->AsType()->AsTypeType()->GetType()->AsRecordType();
auto want_record = fval->GetFieldOrDefault("want_record"); auto want_record = fval->GetFieldOrDefault("want_record");
@ -469,13 +469,13 @@ bool Manager::CreateTableStream(RecordVal* fval)
auto pred = fval->GetFieldOrDefault("pred"); auto pred = fval->GetFieldOrDefault("pred");
auto idx_val = fval->GetFieldOrDefault("idx"); auto idx_val = fval->GetFieldOrDefault("idx");
RecordType* idx = idx_val->AsType()->AsTypeType()->Type()->AsRecordType(); RecordType* idx = idx_val->AsType()->AsTypeType()->GetType()->AsRecordType();
IntrusivePtr<RecordType> val; IntrusivePtr<RecordType> val;
auto val_val = fval->GetFieldOrDefault("val"); auto val_val = fval->GetFieldOrDefault("val");
if ( val_val ) if ( val_val )
val = {NewRef{}, val_val->AsType()->AsTypeType()->Type()->AsRecordType()}; val = val_val->AsType()->AsTypeType()->GetType<RecordType>();
auto dst = fval->GetFieldOrDefault("destination"); auto dst = fval->GetFieldOrDefault("destination");

2
src/logging/Manager.cc
View file

@ -236,7 +236,7 @@ bool Manager::CreateStream(EnumVal* id, RecordVal* sval)
} }
RecordType* columns = sval->GetField("columns") RecordType* columns = sval->GetField("columns")
->AsType()->AsTypeType()->Type()->AsRecordType(); ->AsType()->AsTypeType()->GetType()->AsRecordType();
bool log_attr_present = false; bool log_attr_present = false;

2
src/parse.y
View file

@ -237,7 +237,7 @@ static bool expr_is_table_type_name(const Expr* expr)
return true; return true;
if ( type->Tag() == TYPE_TYPE ) if ( type->Tag() == TYPE_TYPE )
return type->AsTypeType()->Type()->IsTable(); return type->AsTypeType()->GetType()->IsTable();
return false; return false;
} }