beautification

Author: mgudemann

src/java_bytecode/java_bytecode_convert_method_class.h

@@ -99,7 +99,7 @@ class java_bytecode_convert_methodt:public messaget
   codet get_array_bounds_check(
     const exprt &arraystruct,
     const exprt &idx,
-    const source_locationt& original_sloc);
+    const source_locationt &original_sloc);
 
   // return corresponding reference of variable
   const variablet &find_variable_for_slot(
@@ -160,17 +160,17 @@ class java_bytecode_convert_methodt:public messaget
 
 protected:
   void find_initialisers(
-    local_variable_table_with_holest& vars,
-    const address_mapt& amap,
-    const java_cfg_dominatorst& doms);
+    local_variable_table_with_holest &vars,
+    const address_mapt &amap,
+    const java_cfg_dominatorst &doms);
 
   void find_initialisers_for_slot(
     local_variable_table_with_holest::iterator firstvar,
     local_variable_table_with_holest::iterator varlimit,
-    const address_mapt& amap,
-    const java_cfg_dominatorst& doms);
+    const address_mapt &amap,
+    const java_cfg_dominatorst &doms);
 
-  void setup_local_variables(const methodt& m, const address_mapt& amap);
+  void setup_local_variables(const methodt &m, const address_mapt &amap);
 
   struct block_tree_nodet
   {

src/java_bytecode/java_bytecode_language.cpp

@@ -36,7 +36,7 @@ Function: java_bytecode_languaget::get_language_options
 
 \*******************************************************************/
 
-void java_bytecode_languaget::get_language_options(const cmdlinet& cmd)
+void java_bytecode_languaget::get_language_options(const cmdlinet &cmd)
 {
   disable_runtime_checks=cmd.isset("disable-runtime-check");
   assume_inputs_non_null=cmd.isset("java-assume-inputs-non-null");

src/java_bytecode/java_bytecode_language.h

@@ -19,7 +19,7 @@ Author: Daniel Kroening, [email protected]
 class java_bytecode_languaget:public languaget
 {
 public:
-  virtual void get_language_options(const cmdlinet&);
+  virtual void get_language_options(const cmdlinet &);
 
   virtual bool preprocess(
     std::istream &instream,
@@ -42,7 +42,8 @@ class java_bytecode_languaget:public languaget
   virtual ~java_bytecode_languaget();
   java_bytecode_languaget():
     max_nondet_array_length(MAX_NONDET_ARRAY_LENGTH_DEFAULT),
-    max_user_array_length(0) { }
+    max_user_array_length(0)
+    {}
 
   bool from_expr(
     const exprt &expr,

src/java_bytecode/java_bytecode_parser.cpp

@@ -352,7 +352,7 @@ void java_bytecode_parsert::get_class_refs()
       }
       break;
 
-    default:{};
+    default:{}
     }
   }
 
@@ -1243,7 +1243,7 @@ void java_bytecode_parsert::rcode_attribute(methodt &method)
 }
 
 void java_bytecode_parsert::read_verification_type_info(
-  methodt::verification_type_infot& v)
+  methodt::verification_type_infot &v)
 {
   u1 tag=read_u1();
   switch(tag)

src/java_bytecode/java_bytecode_typecheck_expr.cpp

@@ -91,7 +91,7 @@ void java_bytecode_typecheckt::typecheck_expr_java_new_array(
   typecheck_type(type);
 }
 
-static void escape_non_alnum(std::string& toescape)
+static void escape_non_alnum(std::string &toescape)
 {
   for(auto &ch : toescape)
     if(!isalnum(ch))

src/java_bytecode/java_entry_point.cpp

@@ -72,7 +72,7 @@ static void create_initialize(symbol_tablet &symbol_table)
 }
 
 
-static bool should_init_symbol(const symbolt& sym)
+static bool should_init_symbol(const symbolt &sym)
 {
   if(sym.type.id()!=ID_code &&
      sym.is_lvalue &&
@@ -110,13 +110,13 @@ bool java_static_lifetime_init(
   // external. Iterate over a copy of the symtab, as its iterators are
   // invalidated by object_factory:
 
-  std::list<irep_idt> symnames;
+  std::list<irep_idt> symbol_names;
   for(const auto &entry : symbol_table.symbols)
-    symnames.push_back(entry.first);
+    symbol_names.push_back(entry.first);
 
-  for(const auto& symname : symnames)
+  for(const auto &symname : symbol_names)
   {
-    const symbolt& sym=symbol_table.lookup(symname);
+    const symbolt &sym=symbol_table.lookup(symname);
     if(should_init_symbol(sym))
     {
       if(sym.value.is_nil() && sym.type!=empty_typet())

src/java_bytecode/java_local_variable_table.cpp

@@ -156,9 +156,9 @@ Function: gather_transitive_predecessors
 \*******************************************************************/
 
 static void gather_transitive_predecessors(
-  local_variable_with_holest* start,
+  local_variable_with_holest *start,
   const predecessor_mapt &predecessor_map,
-  std::set<local_variable_with_holest*>& result)
+  std::set<local_variable_with_holest*> &result)
 {
   if(!result.insert(start).second)
     return;
@@ -251,7 +251,7 @@ Function: populate_variable_address_map
 static void populate_variable_address_map(
   local_variable_table_with_holest::iterator firstvar,
   local_variable_table_with_holest::iterator varlimit,
-  std::vector<local_variable_with_holest*>& live_variable_at_address)
+  std::vector<local_variable_with_holest *> &live_variable_at_address)
 {
   for(auto it=firstvar, itend=varlimit; it!=itend; ++it)
   {
@@ -298,7 +298,7 @@ Function: populate_predecessor_map
 static void populate_predecessor_map(
   local_variable_table_with_holest::iterator firstvar,
   local_variable_table_with_holest::iterator varlimit,
-  const std::vector<local_variable_with_holest*>& live_variable_at_address,
+  const std::vector<local_variable_with_holest *> &live_variable_at_address,
   const address_mapt &amap,
   predecessor_mapt &predecessor_map,
   message_handlert &msg_handler)
@@ -480,7 +480,7 @@ Function: populate_live_range_holes
 
 static void populate_live_range_holes(
   local_variable_with_holest &merge_into,
-  const std::set<local_variable_with_holest*>& merge_vars,
+  const std::set<local_variable_with_holest *> &merge_vars,
   unsigned expanded_live_range_start)
 {
   std::vector<local_variable_with_holest*> sorted_by_startpc(
@@ -518,7 +518,7 @@ Function: merge_variable_table_entries
 
 static void merge_variable_table_entries(
   local_variable_with_holest &merge_into,
-  const std::set<local_variable_with_holest*>& merge_vars,
+  const std::set<local_variable_with_holest *> &merge_vars,
   const java_cfg_dominatorst &dominator_analysis,
   std::ostream &debug_out)
 {
@@ -729,7 +729,7 @@ Function: cleanup_var_table
 \*******************************************************************/
 
 static void cleanup_var_table(
-  std::vector<local_variable_with_holest>& vars_with_holes)
+  std::vector<local_variable_with_holest> &vars_with_holes)
 {
   size_t toremove=0;
   for(size_t i=0; i<(vars_with_holes.size()-toremove); ++i)
@@ -795,7 +795,7 @@ void java_bytecode_convert_methodt::setup_local_variables(
   // to calculate which variable to use, one uses the address of the instruction
   // that uses the variable, the size of the instruction and the start_pc /
   // length values in the local variable table
-  for(const auto & v : vars_with_holes)
+  for(const auto &v : vars_with_holes)
   {
     if(v.var.start_pc==0) // Parameter?
       continue;

src/java_bytecode/java_object_factory.cpp

@@ -49,7 +49,7 @@ class java_object_factoryt:public messaget
 
 public:
   java_object_factoryt(
-    code_blockt& _init_code,
+    code_blockt &_init_code,
     bool _assume_non_null,
     size_t _max_nondet_array_length,
     symbol_tablet &_symbol_table,
@@ -63,8 +63,8 @@ class java_object_factoryt:public messaget
     {}
 
   exprt allocate_object(
-    const exprt&,
-    const typet&,
+    const exprt &,
+    const typet &,
     const source_locationt &,
     bool create_dynamic_objects);
 
@@ -512,7 +512,7 @@ Function: new_tmp_symbol
 
 \*******************************************************************/
 
-symbolt &new_tmp_symbol(symbol_tablet &symbol_table, const std::string& prefix)
+symbolt &new_tmp_symbol(symbol_tablet &symbol_table, const std::string &prefix)
 {
   static size_t temporary_counter=0; // TODO encapsulate as class variable
 
@@ -542,7 +542,7 @@ Function: get_nondet_bool
 
 \*******************************************************************/
 
-exprt get_nondet_bool(const typet& type)
+exprt get_nondet_bool(const typet &type)
 {
   // We force this to 0 and 1 and won't consider
   // other values.

src/java_bytecode/java_object_factory.h

@@ -34,10 +34,10 @@ void gen_nondet_init(
   size_t max_nondet_array_length=5);
 
 
-exprt get_nondet_bool(const typet&);
+exprt get_nondet_bool(const typet &);
 
 symbolt &new_tmp_symbol(
   symbol_tablet &symbol_table,
-  const std::string& prefix="tmp_object_factory");
+  const std::string &prefix="tmp_object_factory");
 
 #endif // CPROVER_JAVA_BYTECODE_JAVA_OBJECT_FACTORY_H

src/java_bytecode/java_pointer_casts.cpp

@@ -89,7 +89,7 @@ Function: look_through_casts
 
 \*******************************************************************/
 
-static const exprt& look_through_casts(const exprt& in)
+static const exprt &look_through_casts(const exprt &in)
 {
   if(in.id()==ID_typecast)
   {