From adb28453a763fd602ae1223265db16b1bff3f42c Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 2 Sep 2025 10:39:05 -0700 Subject: [PATCH] Remove some unnecessary #includes from binpac source files --- tools/binpac/lib/binpac_buffer.cc | 1 - tools/binpac/src/pac_analyzer.cc | 1 - tools/binpac/src/pac_array.cc | 1 - tools/binpac/src/pac_cclass.h | 11 +++++++---- tools/binpac/src/pac_conn.cc | 2 -- tools/binpac/src/pac_conn.h | 1 - tools/binpac/src/pac_context.cc | 1 - tools/binpac/src/pac_dbg.h | 4 ++-- tools/binpac/src/pac_decl.cc | 6 ------ tools/binpac/src/pac_expr.cc | 2 +- tools/binpac/src/pac_exttype.cc | 1 - tools/binpac/src/pac_flow.cc | 1 - tools/binpac/src/pac_inputbuf.cc | 1 - tools/binpac/src/pac_main.cc | 1 - tools/binpac/src/pac_output.cc | 6 +----- tools/binpac/src/pac_output.h | 6 +++--- tools/binpac/src/pac_param.cc | 1 - tools/binpac/src/pac_paramtype.cc | 1 - tools/binpac/src/pac_record.cc | 2 -- tools/binpac/src/pac_record.h | 1 - tools/binpac/src/pac_redef.cc | 1 - tools/binpac/src/pac_regex.cc | 1 - tools/binpac/src/pac_type.cc | 4 +--- tools/binpac/src/pac_typedecl.cc | 3 +-- tools/binpac/src/pac_varfield.cc | 5 ----- tools/binpac/src/pac_varfield.h | 6 +++--- tools/binpac/src/pac_withinput.cc | 2 -- 27 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 tools/binpac/src/pac_varfield.cc diff --git a/tools/binpac/lib/binpac_buffer.cc b/tools/binpac/lib/binpac_buffer.cc index 7655df0a3b..068467a468 100644 --- a/tools/binpac/lib/binpac_buffer.cc +++ b/tools/binpac/lib/binpac_buffer.cc @@ -1,6 +1,5 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include #include #include // for memcpy diff --git a/tools/binpac/src/pac_analyzer.cc b/tools/binpac/src/pac_analyzer.cc index 196ddbf620..4e0d4c02e4 100644 --- a/tools/binpac/src/pac_analyzer.cc +++ b/tools/binpac/src/pac_analyzer.cc @@ -14,7 +14,6 @@ #include "pac_paramtype.h" #include "pac_state.h" #include "pac_type.h" -#include "pac_varfield.h" AnalyzerDecl::AnalyzerDecl(ID* id, DeclType decl_type, ParamList* params) : TypeDecl(id, params, new DummyType()) { decl_type_ = decl_type; diff --git a/tools/binpac/src/pac_array.cc b/tools/binpac/src/pac_array.cc index d942de1c96..fbd84d30ab 100644 --- a/tools/binpac/src/pac_array.cc +++ b/tools/binpac/src/pac_array.cc @@ -8,7 +8,6 @@ #include "pac_expr.h" #include "pac_exttype.h" #include "pac_id.h" -#include "pac_number.h" #include "pac_output.h" #include "pac_utils.h" #include "pac_varfield.h" diff --git a/tools/binpac/src/pac_cclass.h b/tools/binpac/src/pac_cclass.h index c28b297f22..71bf85867a 100644 --- a/tools/binpac/src/pac_cclass.h +++ b/tools/binpac/src/pac_cclass.h @@ -3,15 +3,18 @@ #ifndef pac_cclass_h #define pac_cclass_h +#include +#include + class CClass; class CClassMember; class CClassMethod; class CType; class CVariable; -typedef vector CClassMemberList; -typedef vector CClassMethodList; -typedef vector CVariableList; +using CClassMemberList = std::vector; +using CClassMethodList = std::vector; +using CVariableList = std::vector; #include "pac_common.h" @@ -44,7 +47,7 @@ protected: class CVariable { public: - CClassMember(const string& name, CType* type); + CVariable(const std::string& name, CType* type); string name() const { return name_; } CType* type() const { return type_; } diff --git a/tools/binpac/src/pac_conn.cc b/tools/binpac/src/pac_conn.cc index eb414036af..b2ee3ecb23 100644 --- a/tools/binpac/src/pac_conn.cc +++ b/tools/binpac/src/pac_conn.cc @@ -4,9 +4,7 @@ #include "pac_analyzer.h" #include "pac_dataunit.h" -#include "pac_embedded.h" #include "pac_exception.h" -#include "pac_expr.h" #include "pac_flow.h" #include "pac_output.h" #include "pac_paramtype.h" diff --git a/tools/binpac/src/pac_conn.h b/tools/binpac/src/pac_conn.h index 08acaebb1b..cfe4f5f55c 100644 --- a/tools/binpac/src/pac_conn.h +++ b/tools/binpac/src/pac_conn.h @@ -4,7 +4,6 @@ #define pac_conn_h #include "pac_analyzer.h" -#include "pac_decl.h" class ConnDecl : public AnalyzerDecl { public: diff --git a/tools/binpac/src/pac_context.cc b/tools/binpac/src/pac_context.cc index f52cf68843..6efa9327f6 100644 --- a/tools/binpac/src/pac_context.cc +++ b/tools/binpac/src/pac_context.cc @@ -4,7 +4,6 @@ #include "pac_analyzer.h" #include "pac_exception.h" -#include "pac_exttype.h" #include "pac_flow.h" #include "pac_id.h" #include "pac_output.h" diff --git a/tools/binpac/src/pac_dbg.h b/tools/binpac/src/pac_dbg.h index 4caa716d07..9e84aa30ab 100644 --- a/tools/binpac/src/pac_dbg.h +++ b/tools/binpac/src/pac_dbg.h @@ -3,8 +3,8 @@ #ifndef pac_dbg_h #define pac_dbg_h -#include -#include +#include +#include extern bool FLAGS_pac_debug; diff --git a/tools/binpac/src/pac_decl.cc b/tools/binpac/src/pac_decl.cc index b402e4ca5b..35563c406b 100644 --- a/tools/binpac/src/pac_decl.cc +++ b/tools/binpac/src/pac_decl.cc @@ -4,16 +4,10 @@ #include "pac_attr.h" #include "pac_context.h" -#include "pac_dataptr.h" #include "pac_embedded.h" #include "pac_exception.h" -#include "pac_expr.h" -#include "pac_exttype.h" #include "pac_id.h" #include "pac_output.h" -#include "pac_param.h" -#include "pac_record.h" -#include "pac_type.h" #include "pac_utils.h" DeclList* Decl::decl_list_ = nullptr; diff --git a/tools/binpac/src/pac_expr.cc b/tools/binpac/src/pac_expr.cc index 6e55bfa8ed..67bac04b40 100644 --- a/tools/binpac/src/pac_expr.cc +++ b/tools/binpac/src/pac_expr.cc @@ -7,12 +7,12 @@ #include "pac_exception.h" #include "pac_exttype.h" #include "pac_id.h" +#include "pac_let.h" #include "pac_nullptr.h" #include "pac_number.h" #include "pac_output.h" #include "pac_record.h" #include "pac_regex.h" -#include "pac_strtype.h" #include "pac_typedecl.h" #include "pac_utils.h" diff --git a/tools/binpac/src/pac_exttype.cc b/tools/binpac/src/pac_exttype.cc index d2adb77aee..8d438abb0a 100644 --- a/tools/binpac/src/pac_exttype.cc +++ b/tools/binpac/src/pac_exttype.cc @@ -2,7 +2,6 @@ #include "pac_exttype.h" -#include "pac_decl.h" #include "pac_id.h" #include "pac_output.h" diff --git a/tools/binpac/src/pac_flow.cc b/tools/binpac/src/pac_flow.cc index 5ec255ffcf..57f987412c 100644 --- a/tools/binpac/src/pac_flow.cc +++ b/tools/binpac/src/pac_flow.cc @@ -7,7 +7,6 @@ #include "pac_context.h" #include "pac_dataptr.h" #include "pac_dataunit.h" -#include "pac_embedded.h" #include "pac_exception.h" #include "pac_expr.h" #include "pac_exttype.h" diff --git a/tools/binpac/src/pac_inputbuf.cc b/tools/binpac/src/pac_inputbuf.cc index a3aa98c8b8..31a9e77a3c 100644 --- a/tools/binpac/src/pac_inputbuf.cc +++ b/tools/binpac/src/pac_inputbuf.cc @@ -6,7 +6,6 @@ #include "pac_exttype.h" #include "pac_id.h" #include "pac_output.h" -#include "pac_type.h" InputBuffer::InputBuffer(Expr* expr) : DataDepElement(INPUT_BUFFER), expr_(expr) {} diff --git a/tools/binpac/src/pac_main.cc b/tools/binpac/src/pac_main.cc index de2859d2c6..82ee608736 100644 --- a/tools/binpac/src/pac_main.cc +++ b/tools/binpac/src/pac_main.cc @@ -6,7 +6,6 @@ #include "pac_common.h" #include "pac_decl.h" #include "pac_exception.h" -#include "pac_exttype.h" #include "pac_id.h" #include "pac_output.h" // NOLINTBEGIN diff --git a/tools/binpac/src/pac_output.cc b/tools/binpac/src/pac_output.cc index ac08dc318a..38845de7cf 100644 --- a/tools/binpac/src/pac_output.cc +++ b/tools/binpac/src/pac_output.cc @@ -7,11 +7,7 @@ #include #include -#include "pac_utils.h" - -OutputException::OutputException(const char* arg_msg) { msg = arg_msg; } - -OutputException::~OutputException() {} +OutputException::OutputException(const char* arg_msg) : msg(arg_msg) {} Output::Output(string filename) { fp = fopen(filename.c_str(), "w"); diff --git a/tools/binpac/src/pac_output.h b/tools/binpac/src/pac_output.h index 15a4b8ed2f..3b424efadb 100644 --- a/tools/binpac/src/pac_output.h +++ b/tools/binpac/src/pac_output.h @@ -3,8 +3,8 @@ #ifndef pac_output_h #define pac_output_h -#include -#include +#include +#include #include using namespace std; @@ -12,7 +12,7 @@ using namespace std; class OutputException { public: OutputException(const char* arg_msg); - ~OutputException(); + ~OutputException() = default; const char* errmsg() const { return msg.c_str(); } protected: diff --git a/tools/binpac/src/pac_param.cc b/tools/binpac/src/pac_param.cc index 4e9b851baa..85d7685a44 100644 --- a/tools/binpac/src/pac_param.cc +++ b/tools/binpac/src/pac_param.cc @@ -2,7 +2,6 @@ #include "pac_param.h" -#include "pac_decl.h" #include "pac_exttype.h" #include "pac_field.h" #include "pac_id.h" diff --git a/tools/binpac/src/pac_paramtype.cc b/tools/binpac/src/pac_paramtype.cc index 9fd2511b1a..ac06b762f4 100644 --- a/tools/binpac/src/pac_paramtype.cc +++ b/tools/binpac/src/pac_paramtype.cc @@ -2,7 +2,6 @@ #include "pac_paramtype.h" -#include "pac_context.h" #include "pac_dataptr.h" #include "pac_exception.h" #include "pac_expr.h" diff --git a/tools/binpac/src/pac_record.cc b/tools/binpac/src/pac_record.cc index 54d57a2921..ec2e7ab630 100644 --- a/tools/binpac/src/pac_record.cc +++ b/tools/binpac/src/pac_record.cc @@ -2,7 +2,6 @@ #include "pac_record.h" -#include "pac_attr.h" #include "pac_dataptr.h" #include "pac_exception.h" #include "pac_expr.h" @@ -12,7 +11,6 @@ #include "pac_type.h" #include "pac_typedecl.h" #include "pac_utils.h" -#include "pac_varfield.h" RecordType::RecordType(RecordFieldList* record_fields) : Type(RECORD) { // Here we assume that the type is a standalone type. diff --git a/tools/binpac/src/pac_record.h b/tools/binpac/src/pac_record.h index 0323cf62b0..d952050971 100644 --- a/tools/binpac/src/pac_record.h +++ b/tools/binpac/src/pac_record.h @@ -6,7 +6,6 @@ #include "pac_common.h" #include "pac_field.h" #include "pac_id.h" -#include "pac_let.h" #include "pac_type.h" class RecordType : public Type { diff --git a/tools/binpac/src/pac_redef.cc b/tools/binpac/src/pac_redef.cc index 03c327ec7c..ff95f527b7 100644 --- a/tools/binpac/src/pac_redef.cc +++ b/tools/binpac/src/pac_redef.cc @@ -7,7 +7,6 @@ #include "pac_exception.h" #include "pac_expr.h" #include "pac_func.h" -#include "pac_record.h" #include "pac_type.h" #include "pac_typedecl.h" diff --git a/tools/binpac/src/pac_regex.cc b/tools/binpac/src/pac_regex.cc index 517ca91451..af6a5aa6dc 100644 --- a/tools/binpac/src/pac_regex.cc +++ b/tools/binpac/src/pac_regex.cc @@ -5,7 +5,6 @@ #include "pac_exttype.h" #include "pac_id.h" #include "pac_output.h" -#include "pac_type.h" // Depends on the regular expression library we are using const char* RegEx::kREMatcherType = "RegExMatcher"; diff --git a/tools/binpac/src/pac_type.cc b/tools/binpac/src/pac_type.cc index 354fc3cc16..8284a9e420 100644 --- a/tools/binpac/src/pac_type.cc +++ b/tools/binpac/src/pac_type.cc @@ -2,13 +2,10 @@ #include "pac_type.h" -#include "pac_action.h" #include "pac_array.h" #include "pac_attr.h" #include "pac_btype.h" -#include "pac_context.h" #include "pac_dataptr.h" -#include "pac_decl.h" #include "pac_exception.h" #include "pac_expr.h" #include "pac_exttype.h" @@ -18,6 +15,7 @@ #include "pac_output.h" #include "pac_paramtype.h" #include "pac_strtype.h" +#include "pac_typedecl.h" #include "pac_utils.h" #include "pac_varfield.h" #include "pac_withinput.h" diff --git a/tools/binpac/src/pac_typedecl.cc b/tools/binpac/src/pac_typedecl.cc index 5c4af595a3..45c7d28385 100644 --- a/tools/binpac/src/pac_typedecl.cc +++ b/tools/binpac/src/pac_typedecl.cc @@ -5,16 +5,15 @@ #include "pac_attr.h" #include "pac_context.h" #include "pac_dataptr.h" -#include "pac_embedded.h" #include "pac_enum.h" #include "pac_exception.h" #include "pac_expr.h" #include "pac_exttype.h" #include "pac_id.h" +#include "pac_let.h" #include "pac_output.h" #include "pac_param.h" #include "pac_paramtype.h" -#include "pac_record.h" #include "pac_type.h" #include "pac_utils.h" diff --git a/tools/binpac/src/pac_varfield.cc b/tools/binpac/src/pac_varfield.cc deleted file mode 100644 index 713c584d00..0000000000 --- a/tools/binpac/src/pac_varfield.cc +++ /dev/null @@ -1,5 +0,0 @@ -// See the file "COPYING" in the main distribution directory for copyright. - -#include "pac_varfield.h" - -void PrivVarField::Prepare(Env* env) { Field::Prepare(env); } diff --git a/tools/binpac/src/pac_varfield.h b/tools/binpac/src/pac_varfield.h index 6fbf2148af..65271ba4e0 100644 --- a/tools/binpac/src/pac_varfield.h +++ b/tools/binpac/src/pac_varfield.h @@ -18,7 +18,7 @@ class PubVarField : public Field { public: PubVarField(ID* id, Type* type) : Field(PUB_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | CLASS_MEMBER | PUBLIC_READABLE, id, type) {} - ~PubVarField() override {} + ~PubVarField() override = default; }; // A private variable @@ -26,7 +26,7 @@ class PrivVarField : public Field { public: PrivVarField(ID* id, Type* type) : Field(PRIV_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | CLASS_MEMBER | NOT_PUBLIC_READABLE, id, type) {} - ~PrivVarField() override {} + ~PrivVarField() override = default; void GenPubDecls(Output* out, Env* env) override { /* do nothing */ } }; @@ -34,7 +34,7 @@ public: class TempVarField : public Field { public: TempVarField(ID* id, Type* type) : Field(TEMP_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | NOT_CLASS_MEMBER, id, type) {} - ~TempVarField() override {} + ~TempVarField() override = default; }; #endif // pac_varfield_h diff --git a/tools/binpac/src/pac_withinput.cc b/tools/binpac/src/pac_withinput.cc index 0bffbd34eb..9751832300 100644 --- a/tools/binpac/src/pac_withinput.cc +++ b/tools/binpac/src/pac_withinput.cc @@ -2,8 +2,6 @@ #include "pac_withinput.h" -#include "pac_dataptr.h" -#include "pac_expr.h" #include "pac_inputbuf.h" #include "pac_output.h" #include "pac_type.h"