Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

binpac: Add 'override' to virtual methods in generated code

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-06-10 10:34:15 -07:00
parent 28cc9ca3ec
commit ef962376bc
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/binpac/lib/binpac_analyzer.h
View file

@ -8,14 +8,14 @@ namespace binpac {
// The interface for a connection analyzer // The interface for a connection analyzer
class ConnectionAnalyzer { class ConnectionAnalyzer {
public: public:
virtual ~ConnectionAnalyzer() {} virtual ~ConnectionAnalyzer() = default;
virtual void NewData(bool is_orig, const unsigned char* begin_of_data, const unsigned char* end_of_data) = 0; virtual void NewData(bool is_orig, const unsigned char* begin_of_data, const unsigned char* end_of_data) = 0;
}; };
// The interface for a flow analyzer // The interface for a flow analyzer
class FlowAnalyzer { class FlowAnalyzer {
public: public:
virtual ~FlowAnalyzer() {} virtual ~FlowAnalyzer() = default;
virtual void NewData(const unsigned char* begin_of_data, const unsigned char* end_of_data) = 0; virtual void NewData(const unsigned char* begin_of_data, const unsigned char* end_of_data) = 0;
}; };

2
tools/binpac/src/pac_conn.cc
View file

@ -110,7 +110,7 @@ void ConnDecl::GenGapFunc(Output* out_h, Output* out_cc) {
void ConnDecl::GenProcessFunc(Output* out_h, Output* out_cc) { void ConnDecl::GenProcessFunc(Output* out_h, Output* out_cc) {
string proto = strfmt("%s(bool is_orig, const_byteptr begin, const_byteptr end)", kNewData); string proto = strfmt("%s(bool is_orig, const_byteptr begin, const_byteptr end)", kNewData);
out_h->println("void %s;", proto.c_str()); out_h->println("void %s override;", proto.c_str());
out_cc->println("void %s::%s {", class_name().c_str(), proto.c_str()); out_cc->println("void %s::%s {", class_name().c_str(), proto.c_str());
out_cc->inc_indent(); out_cc->inc_indent();

2
tools/binpac/src/pac_flow.cc
View file

@ -151,7 +151,7 @@ void FlowDecl::GenProcessFunc(Output* out_h, Output* out_cc) {
string proto = strfmt("%s(const_byteptr %s, const_byteptr %s)", kNewData, env_->LValue(begin_of_data), string proto = strfmt("%s(const_byteptr %s, const_byteptr %s)", kNewData, env_->LValue(begin_of_data),
env_->LValue(end_of_data)); env_->LValue(end_of_data));
out_h->println("void %s;", proto.c_str()); out_h->println("void %s override;", proto.c_str());
out_cc->println("void %s::%s {", class_name().c_str(), proto.c_str()); out_cc->println("void %s::%s {", class_name().c_str(), proto.c_str());
out_cc->inc_indent(); out_cc->inc_indent();

6
tools/binpac/src/pac_typedecl.cc
View file

@ -178,9 +178,15 @@ void TypeDecl::GenConstructorFunc(Output* out_h, Output* out_cc) {
} }
void TypeDecl::GenDestructorFunc(Output* out_h, Output* out_cc) { void TypeDecl::GenDestructorFunc(Output* out_h, Output* out_cc) {
vector<string> base_classes;
AddBaseClass(&base_classes);
string proto = strfmt("~%s()", class_name().c_str()); string proto = strfmt("~%s()", class_name().c_str());
if ( base_classes.empty() )
out_h->println("%s;", proto.c_str()); out_h->println("%s;", proto.c_str());
else
out_h->println("%s override;", proto.c_str());
out_cc->println("%s::%s {", class_name().c_str(), proto.c_str()); out_cc->println("%s::%s {", class_name().c_str(), proto.c_str());
out_cc->inc_indent(); out_cc->inc_indent();