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

Remove const from ShallowClone.

Browse source 
It was not actually const due to Ref-ing.
This commit is contained in:
Johanna Amann 2019-05-23 18:52:53 -07:00
parent 38652ee8d9
commit 9f4749adce
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Type.cc
View file

@ -121,7 +121,7 @@ BroType::BroType(TypeTag t, bool arg_base_type)
} }
BroType* BroType::ShallowClone() const BroType* BroType::ShallowClone()
{ {
switch ( tag ) { switch ( tag ) {
case TYPE_VOID: case TYPE_VOID:
@ -401,7 +401,7 @@ TableType::TableType(TypeList* ind, BroType* yield)
} }
} }
TableType* TableType::ShallowClone() const TableType* TableType::ShallowClone()
{ {
if ( indices ) if ( indices )
indices->Ref(); indices->Ref();
@ -518,7 +518,7 @@ FuncType::FuncType(RecordType* arg_args, BroType* arg_yield, function_flavor arg
} }
} }
FuncType* FuncType::ShallowClone() const FuncType* FuncType::ShallowClone()
{ {
auto f = new FuncType(); auto f = new FuncType();
f->args = args->Ref()->AsRecordType(); f->args = args->Ref()->AsRecordType();
@ -688,7 +688,7 @@ RecordType::RecordType(type_decl_list* arg_types) : BroType(TYPE_RECORD)
// in this case the clone is actually not so shallow, since // in this case the clone is actually not so shallow, since
// it gets modified by everyone. // it gets modified by everyone.
RecordType* RecordType::ShallowClone() const RecordType* RecordType::ShallowClone()
{ {
auto pass = new type_decl_list(); auto pass = new type_decl_list();
loop_over_list(*types, i) loop_over_list(*types, i)
@ -1053,7 +1053,7 @@ EnumType::EnumType(const EnumType* e)
vals = e->vals; vals = e->vals;
} }
EnumType* EnumType::ShallowClone() const EnumType* EnumType::ShallowClone()
{ {
if ( counter == 0 ) if ( counter == 0 )
return new EnumType(GetName()); return new EnumType(GetName());
@ -1289,7 +1289,7 @@ VectorType::VectorType(BroType* element_type)
{ {
} }
VectorType* VectorType::ShallowClone() const VectorType* VectorType::ShallowClone()
{ {
return new VectorType(yield_type); return new VectorType(yield_type);
} }

18
src/Type.h
View file

@ -94,7 +94,7 @@ public:
// Clone operations will mostly be implemented in the derived classes; // Clone operations will mostly be implemented in the derived classes;
// in addition cloning will be limited to classes that can be reached by // in addition cloning will be limited to classes that can be reached by
// the script-level. // the script-level.
virtual BroType* ShallowClone() const; virtual BroType* ShallowClone();
TypeTag Tag() const { return tag; } TypeTag Tag() const { return tag; }
InternalTypeTag InternalType() const { return internal_tag; } InternalTypeTag InternalType() const { return internal_tag; }
@ -364,7 +364,7 @@ class TableType : public IndexType {
public: public:
TableType(TypeList* ind, BroType* yield); TableType(TypeList* ind, BroType* yield);
TableType* ShallowClone() const override; TableType* ShallowClone() override;
// Returns true if this table type is "unspecified", which is // Returns true if this table type is "unspecified", which is
// what one gets using an empty "set()" or "table()" constructor. // what one gets using an empty "set()" or "table()" constructor.
@ -392,7 +392,7 @@ protected:
class FuncType : public BroType { class FuncType : public BroType {
public: public:
FuncType(RecordType* args, BroType* yield, function_flavor f); FuncType(RecordType* args, BroType* yield, function_flavor f);
FuncType* ShallowClone() const override; FuncType* ShallowClone() override;
~FuncType() override; ~FuncType() override;
@ -426,7 +426,7 @@ protected:
class TypeType : public BroType { class TypeType : public BroType {
public: public:
explicit TypeType(BroType* t) : BroType(TYPE_TYPE) { type = t->Ref(); } explicit TypeType(BroType* t) : BroType(TYPE_TYPE) { type = t->Ref(); }
TypeType* ShallowClone() const override { return new TypeType(type); } TypeType* ShallowClone() override { return new TypeType(type); }
~TypeType() override { Unref(type); } ~TypeType() override { Unref(type); }
BroType* Type() { return type; } BroType* Type() { return type; }
@ -459,7 +459,7 @@ typedef PList(TypeDecl) type_decl_list;
class RecordType : public BroType { class RecordType : public BroType {
public: public:
explicit RecordType(type_decl_list* types); explicit RecordType(type_decl_list* types);
RecordType* ShallowClone() const override; RecordType* ShallowClone() override;
~RecordType() override; ~RecordType() override;
@ -508,7 +508,7 @@ public:
class FileType : public BroType { class FileType : public BroType {
public: public:
explicit FileType(BroType* yield_type); explicit FileType(BroType* yield_type);
FileType* ShallowClone() const override { return new FileType(yield->Ref()); } FileType* ShallowClone() override { return new FileType(yield->Ref()); }
~FileType() override; ~FileType() override;
BroType* YieldType() override; BroType* YieldType() override;
@ -524,7 +524,7 @@ protected:
class OpaqueType : public BroType { class OpaqueType : public BroType {
public: public:
explicit OpaqueType(const string& name); explicit OpaqueType(const string& name);
OpaqueType* ShallowClone() const override { return new OpaqueType(name); } OpaqueType* ShallowClone() override { return new OpaqueType(name); }
~OpaqueType() override { }; ~OpaqueType() override { };
const string& Name() const { return name; } const string& Name() const { return name; }
@ -544,7 +544,7 @@ public:
explicit EnumType(const EnumType* e); explicit EnumType(const EnumType* e);
explicit EnumType(const string& arg_name); explicit EnumType(const string& arg_name);
EnumType* ShallowClone() const override; EnumType* ShallowClone() override;
~EnumType() override; ~EnumType() override;
// The value of this name is next internal counter value, starting // The value of this name is next internal counter value, starting
@ -596,7 +596,7 @@ protected:
class VectorType : public BroType { class VectorType : public BroType {
public: public:
explicit VectorType(BroType* t); explicit VectorType(BroType* t);
VectorType* ShallowClone() const override; VectorType* ShallowClone() override;
~VectorType() override; ~VectorType() override;
BroType* YieldType() override; BroType* YieldType() override;
const BroType* YieldType() const override; const BroType* YieldType() const override;