codestyle in src subdirs

sjanssen2 · sjanssen2 · commit fa8b11c9c96a · 2025-01-23T09:50:04.000+01:00
diff --git a/src/ambiguity_cfg_gen/algebra_function_info_attribute.cc b/src/ambiguity_cfg_gen/algebra_function_info_attribute.cc
@@ -21,6 +21,8 @@
 
 }}} */
 
+#include <string>
+#include <list>
 #include "algebra_function_info_attribute.hh"
 
 
diff --git a/src/ambiguity_cfg_gen/generate_ambiguity_cfg.cc b/src/ambiguity_cfg_gen/generate_ambiguity_cfg.cc
@@ -23,7 +23,8 @@
 
 #include "generate_ambiguity_cfg.hh"
 
-
+#include <list>
+#include <string>
 #include <boost/format.hpp>
 
 #include "../const.hh"
diff --git a/src/ambiguity_cfg_gen/grammar_vm.cc b/src/ambiguity_cfg_gen/grammar_vm.cc
@@ -22,6 +22,8 @@
 }}} */
 
 #include <sstream>
+#include <list>
+#include <string>
 // #include <boost/format.hpp>
 
 #include "../log.hh"
diff --git a/src/ambiguity_cfg_gen/grammar_vm_code.cc b/src/ambiguity_cfg_gen/grammar_vm_code.cc
@@ -23,6 +23,8 @@
 
 
 #include "grammar_vm_code.hh"
+#include <string>
+#include <list>
 
 
 AmbiguityCFG::GrammarVMCode::GrammarVMCode(
diff --git a/src/ambiguity_cfg_gen/grammar_vm_command.cc b/src/ambiguity_cfg_gen/grammar_vm_command.cc
@@ -22,6 +22,8 @@
 }}} */
 
 #include "grammar_vm_command.hh"
+#include <string>
+#include <list>
 
 
 AmbiguityCFG::GrammarVMCommand::GrammarVMCommand(
diff --git a/src/ambiguity_cfg_gen/grammar_vm_command.hh b/src/ambiguity_cfg_gen/grammar_vm_command.hh
@@ -39,10 +39,10 @@ namespace AmbiguityCFG {
 // Defines all types of grammar VM commands. The types will be used
 // to distinguish all subclasses of the GrammarVMCommand base class.
 enum GrammarVMCommandType {LOAD_INT, LOAD_CHAR, LOAD_STRING, LOAD_THIS,
-  LOAD_VAR, STORE_VAR, CREATE_VAR, LOAD_CONTEXT, STORE_CONTEXT, WRAP_CONTEXT,
-  MERGE_CONTEXTS, CLEAR_CONTEXT, CLEAR_LOCAL_CONTEXT, CREATE_EPSILON,
-  CREATE_TERMINAL, CREATE_NONTERMINAL, CREATE_PRODUCTION_FRAGMENT, COMBINE,
-  RETURN, DUPLICATE, SWAP, POP_STACK, CALL_FUNCTION};
+LOAD_VAR, STORE_VAR, CREATE_VAR, LOAD_CONTEXT, STORE_CONTEXT, WRAP_CONTEXT,
+MERGE_CONTEXTS, CLEAR_CONTEXT, CLEAR_LOCAL_CONTEXT, CREATE_EPSILON,
+CREATE_TERMINAL, CREATE_NONTERMINAL, CREATE_PRODUCTION_FRAGMENT, COMBINE,
+RETURN, DUPLICATE, SWAP, POP_STACK, CALL_FUNCTION};
 
 
 // This is the base class of all grammar VM commands.
diff --git a/src/ambiguity_cfg_gen/grammar_vm_function_compiler.cc b/src/ambiguity_cfg_gen/grammar_vm_function_compiler.cc
@@ -26,6 +26,8 @@
 
 #include <cassert>
 #include <boost/format.hpp>
+#include <string>
+#include <list>
 
 #include "../const.hh"
 #include "../hashtable.hh"
diff --git a/src/ambiguity_cfg_gen/grammar_vm_function_exec_environment.cc b/src/ambiguity_cfg_gen/grammar_vm_function_exec_environment.cc
@@ -26,6 +26,9 @@
 
 #include <sstream>
 #include <boost/format.hpp>
+#include <string>
+#include <list>
+#include <vector>
 
 #include "../log.hh"
 
diff --git a/src/ambiguity_cfg_gen/grammar_vm_stack.cc b/src/ambiguity_cfg_gen/grammar_vm_stack.cc
@@ -25,6 +25,7 @@
 
 #include <cassert>
 #include <iostream>
+#include <vector>
 
 
 AmbiguityCFG::GrammarVMStack::GrammarVMStack() {
@@ -64,7 +65,7 @@ void AmbiguityCFG::GrammarVMStack::reset() {
 
 
 AmbiguityCFG::GrammarVMStackElement::GrammarVMStackElement(
-  AmbiguityCFG::GrammarVMStackElementType t)
+AmbiguityCFG::GrammarVMStackElementType t)
   : type(t) {
 }
 
diff --git a/src/ambiguity_cfg_gen/transform_gap_to_cfg.cc b/src/ambiguity_cfg_gen/transform_gap_to_cfg.cc
@@ -24,6 +24,8 @@
 #include "transform_gap_to_cfg.hh"
 
 #include <boost/format.hpp>
+#include <list>
+#include <string>
 
 #include "../const.hh"
 #include "algebra_function_info_attribute.hh"
diff --git a/src/ambiguity_cfg_gen/var_info_item.cc b/src/ambiguity_cfg_gen/var_info_item.cc
@@ -25,6 +25,8 @@
 
 #include <iostream>
 #include <cassert>
+#include <vector>
+#include <string>
 
 
 //////////////////////////////////////////////////////////
diff --git a/src/ambiguity_cfg_gen/var_info_item.hh b/src/ambiguity_cfg_gen/var_info_item.hh
@@ -39,7 +39,7 @@ namespace AmbiguityCFG {
 // The base class VarInfoItem needs no constant itself because
 // no instance can be created directly from that class.
 enum InfoType {VAR_DECL_INFO, MULTI_VAR_DECL_INFO, RECORD_DECL_INFO,
-               MULTI_RECORD_DECL_INFO};
+MULTI_RECORD_DECL_INFO};
 
 
 // The base class of all variable information items. It is
diff --git a/src/ambiguity_cfg_gen/variable_context.cc b/src/ambiguity_cfg_gen/variable_context.cc
@@ -24,6 +24,8 @@
 #include "variable_context.hh"
 
 #include <cassert>
+#include <vector>
+#include <string>
 
 #include "../cfg/cfg.hh"
 #include "../log.hh"
diff --git a/src/cfg/cfg.cc b/src/cfg/cfg.cc
@@ -23,8 +23,11 @@
 
 #include "cfg.hh"
 
-#include "boost/format.hpp"
+#include <string>
+#include <list>
+#include <vector>
 
+#include "boost/format.hpp"
 #include "../log.hh"
 
 
diff --git a/src/cfg/cfg.hh b/src/cfg/cfg.hh
@@ -111,7 +111,7 @@ class CFG : public Util::Attributable {
 // This enum contains all types that belong to the Base-hirarchy.
 // It is part of the simple reflection implemenation.
 enum Type {BASE, SNAPSHOT, EPSILON, TERMINAL, NONTERMINAL, REGULAR_EXPRESSION,
-           PRODUCTION_SEQUENCE, PRODUCTION_ALTERNATIVE, BASE_WRAPPER};
+PRODUCTION_SEQUENCE, PRODUCTION_ALTERNATIVE, BASE_WRAPPER};
 
 
 // The common base class of terminal and non-terminal symbols. It serves
diff --git a/src/cfg/remove_unused_productions.cc b/src/cfg/remove_unused_productions.cc
@@ -23,7 +23,8 @@
 
 #include "remove_unused_productions.hh"
 
-
+#include <set>
+#include <string>
 #include <iostream>
 
 
diff --git a/src/expr/base.hh b/src/expr/base.hh
@@ -105,7 +105,7 @@ inline std::ostream &operator<<(std::ostream &s, const Base &b) {
 
 
 template <class ret, class expr, class Iterator> ret *seq_to_tree(
-  Iterator begin, Iterator end) {
+Iterator begin, Iterator end) {
   Iterator i = begin;
   if (i == end) {
     assert(false);
diff --git a/src/expr/fn_call.cc b/src/expr/fn_call.cc
@@ -23,7 +23,11 @@
 
 #include "fn_call.hh"
 
-
+#include <iostream>
+#include <map>
+#include <vector>
+#include <string>
+#include <list>
 #include "../filter.hh"
 
 #include "../fn_decl.hh"
diff --git a/src/expr/new.cc b/src/expr/new.cc
@@ -23,6 +23,7 @@
 
 #include "new.hh"
 
+#include <list>
 #include "../type.hh"
 
 void Expr::New::put(std::ostream &s) const {
diff --git a/src/expr/vacc.cc b/src/expr/vacc.cc
@@ -24,6 +24,7 @@
 
 #include "vacc.hh"
 
+#include <string>
 #include "../statement.hh"
 #include "../var_acc.hh"
 
diff --git a/src/outside/codegen.cc b/src/outside/codegen.cc
@@ -22,6 +22,9 @@
 }}} */
 
 #include "codegen.hh"
+#include <vector>
+#include <list>
+#include <string>
 
 
 std::list<Symbol::NT*> *NTs_to_report(const AST &ast) {
diff --git a/src/outside/grammar_transformation.cc b/src/outside/grammar_transformation.cc
@@ -22,6 +22,10 @@
 }}} */
 
 #include <utility>
+#include <vector>
+#include <set>
+#include <list>
+#include <string>
 #include "grammar_transformation.hh"
 #include "../expr/new.hh"
 
diff --git a/src/outside/middle_end.cc b/src/outside/middle_end.cc
@@ -65,6 +65,9 @@
  */
 
 #include "middle_end.hh"
+#include <utility>
+#include <vector>
+#include <list>
 
 
 void Alt::Base::outside_collect_parsers(
diff --git a/src/specialize_grammar/call_trace.cc b/src/specialize_grammar/call_trace.cc
@@ -23,6 +23,7 @@
 
 #include <utility>
 #include <string>
+#include <map>
 #include "call_trace.hh"
 
 
diff --git a/src/specialize_grammar/create_specialized_grammar.cc b/src/specialize_grammar/create_specialized_grammar.cc
@@ -25,6 +25,7 @@
 #include <list>
 #include <string>
 #include <utility>
+#include <iostream>
 
 #include "create_specialized_grammar.hh"
 
diff --git a/src/specialize_grammar/cycle_path_info_attribute.cc b/src/specialize_grammar/cycle_path_info_attribute.cc
@@ -23,6 +23,7 @@
 
 #include <utility>
 #include <string>
+#include <list>
 #include "cycle_path_info_attribute.hh"
 
 
diff --git a/src/specialize_grammar/hidden_cfg_fragments_attribute.cc b/src/specialize_grammar/hidden_cfg_fragments_attribute.cc
@@ -22,6 +22,7 @@
 }}} */
 
 #include "hidden_cfg_fragments_attribute.hh"
+#include <set>
 
 
 SpecializeGrammar::HiddenCFGFragmentsAttribute::HiddenCFGFragmentsAttribute()
diff --git a/src/specialize_grammar/rewrite_non_productive_cfg_rules.cc b/src/specialize_grammar/rewrite_non_productive_cfg_rules.cc
@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cassert>
+#include <list>
 
 #include "../log.hh"
 #include "../util/annotate_cycles.hh"
diff --git a/src/statement/backtrace_decl.cc b/src/statement/backtrace_decl.cc
@@ -22,6 +22,8 @@
 }}} */
 
 #include <vector>
+#include <list>
+#include <string>
 #include "backtrace_decl.hh"
 
 #include "../printer.hh"
diff --git a/src/statement/base.cc b/src/statement/base.cc
@@ -22,6 +22,7 @@
 }}} */
 
 #include <cstdlib>
+#include <list>
 
 #include "base.hh"
 
diff --git a/src/statement/fn_call.cc b/src/statement/fn_call.cc
@@ -22,6 +22,8 @@
 }}} */
 
 #include <vector>
+#include <list>
+#include <string>
 #include "fn_call.hh"
 
 #include "../printer.hh"
diff --git a/src/statement/table_decl.cc b/src/statement/table_decl.cc
@@ -22,6 +22,7 @@
 }}} */
 
 #include <string>
+#include <list>
 #include "table_decl.hh"
 
 #include "../printer.hh"
@@ -31,26 +32,25 @@
 namespace Statement {
 
 Table_Decl::Table_Decl(
-    Symbol::NT &nt,
-    ::Type::Base *t, std::string *n,
-        bool c,
-        Fn_Def *fn_is_tab,
-        Fn_Def *fn_tab,
-        Fn_Def *fn_get_tab,
-        Fn_Def *fn_size,
-        const std::list<Statement::Var_Decl*> &ns
-        )
-  : Base(TABLE_DECL),
-  nt_(nt),
-  type_(t),
-  pos_type_(0),
-  name_(n), cyk_(c),
-  fn_is_tab_(fn_is_tab),
-  fn_untab_(0),
-  fn_tab_(fn_tab),
-  fn_get_tab_(fn_get_tab),
-  fn_size_(fn_size),
-  ns_(ns) {
+Symbol::NT &nt,
+::Type::Base *t, std::string *n,
+bool c,
+Fn_Def *fn_is_tab,
+Fn_Def *fn_tab,
+Fn_Def *fn_get_tab,
+Fn_Def *fn_size,
+const std::list<Statement::Var_Decl*> &ns)
+: Base(TABLE_DECL),
+nt_(nt),
+type_(t),
+pos_type_(0),
+name_(n), cyk_(c),
+fn_is_tab_(fn_is_tab),
+fn_untab_(0),
+fn_tab_(fn_tab),
+fn_get_tab_(fn_get_tab),
+fn_size_(fn_size),
+ns_(ns) {
   // FIXME?
   pos_type_ = new ::Type::Size();
 }
diff --git a/src/statement/while.cc b/src/statement/while.cc
@@ -28,8 +28,7 @@
 
 namespace Statement {
 
-While::While(Expr::Base *e, const Loc &l)
-  : Block_Base(WHILE), expr_(e) {
+While::While(Expr::Base *e, const Loc &l) : Block_Base(WHILE), expr_(e) {
 }
 
 void While::print(Printer::Base &p) const {
diff --git a/src/type/base.hh b/src/type/base.hh
diff --git a/src/type/multi.cc b/src/type/multi.cc
diff --git a/src/util/annotate_cycles.cc b/src/util/annotate_cycles.cc
diff --git a/src/util/annotate_dead_ends.cc b/src/util/annotate_dead_ends.cc
diff --git a/src/util/annotate_reducible_attributes.cc b/src/util/annotate_reducible_attributes.cc
diff --git a/src/util/annotate_the_set_first.cc b/src/util/annotate_the_set_first.cc
diff --git a/src/util/attributable.cc b/src/util/attributable.cc
diff --git a/src/util/attribute.cc b/src/util/attribute.cc
diff --git a/src/util/cycle_attribute.cc b/src/util/cycle_attribute.cc
diff --git a/src/util/cycle_set.cc b/src/util/cycle_set.cc
diff --git a/src/util/last_element_of_cycle_attribute.cc b/src/util/last_element_of_cycle_attribute.cc
diff --git a/src/util/naming_path.cc b/src/util/naming_path.cc
