Merge pull request diffblue#3678 from tautschnig/vs-shadow-cpp

Avoid shadowing in directory cpp/ [blocks: diffblue#2310]

Author: Daniel Kroening

src/cpp/cpp_typecheck.h

@@ -232,12 +232,11 @@ class cpp_typecheckt:public c_typecheck_baset
   std::string template_suffix(
     const cpp_template_args_tct &template_args);
 
-  void convert_parameters(
-    const irep_idt &mode,
-    code_typet &function_type);
+  void
+  convert_parameters(const irep_idt &current_mode, code_typet &function_type);
 
   void convert_parameter(
-    const irep_idt &mode,
+    const irep_idt &current_mode,
     code_typet::parametert &parameter);
 
   //

src/cpp/cpp_typecheck_compound_type.cpp

@@ -610,7 +610,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
           id2string(component.get_name())+"::"+id2string(virtual_base);
         func_symb.base_name = component.get_base_name();
         func_symb.pretty_name = component.get_base_name();
-        func_symb.mode=ID_cpp;
+        func_symb.mode = symbol.mode;
         func_symb.module=module;
         func_symb.location=component.source_location();
         func_symb.type=component.type();
@@ -635,7 +635,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
             id2string(func_symb.name) + "::" + id2string(param_base_name);
           arg_symb.base_name = param_base_name;
           arg_symb.pretty_name = param_base_name;
-          arg_symb.mode=ID_cpp;
+          arg_symb.mode = symbol.mode;
           arg_symb.location=func_symb.location;
           arg_symb.type=arg.type();
 
@@ -1313,7 +1313,7 @@ void cpp_typecheckt::typecheck_member_function(
   symbol.name=identifier;
   symbol.base_name=component.get_base_name();
   symbol.value.swap(value);
-  symbol.mode=ID_cpp;
+  symbol.mode = compound_symbol.mode;
   symbol.module=module;
   symbol.type=type;
   symbol.is_type=false;

src/cpp/cpp_typecheck_enum_type.cpp

@@ -58,7 +58,7 @@ void cpp_typecheckt::typecheck_enum_body(symbolt &enum_symbol)
     symbol.value=value_expr;
     symbol.location=
       static_cast<const source_locationt &>(it->find(ID_C_source_location));
-    symbol.mode=ID_cpp;
+    symbol.mode = enum_symbol.mode;
     symbol.module=module;
     symbol.type=enum_tag_type;
     symbol.is_type=false;

src/cpp/cpp_typecheck_function.cpp

@@ -18,7 +18,7 @@ Author: Daniel Kroening, [email protected]
 #include "cpp_util.h"
 
 void cpp_typecheckt::convert_parameter(
-  const irep_idt &mode,
+  const irep_idt &current_mode,
   code_typet::parametert &parameter)
 {
   irep_idt base_name=id2string(parameter.get_base_name());
@@ -44,7 +44,7 @@ void cpp_typecheckt::convert_parameter(
   symbol.name=identifier;
   symbol.base_name=parameter.get_base_name();
   symbol.location=parameter.source_location();
-  symbol.mode=mode;
+  symbol.mode = current_mode;
   symbol.module=module;
   symbol.type=parameter.type();
   symbol.is_state_var=true;
@@ -68,7 +68,7 @@ void cpp_typecheckt::convert_parameter(
 }
 
 void cpp_typecheckt::convert_parameters(
-  const irep_idt &mode,
+  const irep_idt &current_mode,
   code_typet &function_type)
 {
   code_typet::parameterst &parameters=
@@ -78,7 +78,7 @@ void cpp_typecheckt::convert_parameters(
       it=parameters.begin();
       it!=parameters.end();
       it++)
-    convert_parameter(mode, *it);
+    convert_parameter(current_mode, *it);
 }
 
 void cpp_typecheckt::convert_function(symbolt &symbol)

src/cpp/cpp_typecheck_namespace.cpp

@@ -93,10 +93,7 @@ void cpp_typecheckt::convert(cpp_namespace_spect &namespace_spec)
   else
   {
     // do the declarations
-    for(cpp_namespace_spect::itemst::iterator
-        it=namespace_spec.items().begin();
-        it!=namespace_spec.items().end();
-        it++)
-      convert(*it);
+    for(auto &item : namespace_spec.items())
+      convert(item);
   }
 }

src/cpp/cpp_typecheck_virtual_table.cpp

@@ -71,7 +71,7 @@ void cpp_typecheckt::do_virtual_table(const symbolt &symbol)
       id2string(vt_symb_type.name) + "@"+ id2string(symbol.name);
     vt_symb_var.base_name=
       id2string(vt_symb_type.base_name) + "@" + id2string(symbol.base_name);
-    vt_symb_var.mode=ID_cpp;
+    vt_symb_var.mode = symbol.mode;
     vt_symb_var.module=module;
     vt_symb_var.location=vt_symb_type.location;
     vt_symb_var.type = struct_tag_typet(vt_symb_type.name);