Merge pull request diffblue#25 from diffblue/smowton/cleanup/rename_namespace_utils

Rename namespace utils

Author: smowton

src/taint-analysis/taint_statistics.cpp

@@ -17,7 +17,7 @@ traces (if any).
 
 #include <taint-analysis/taint_statistics.h>
 #include <cassert>
-#include <util/namespace_utils.h>
+#include <util/symbol_utils.h>
 
 
 static inline  taint_statisticst::time_pointt  get_current_time()
@@ -59,15 +59,15 @@ static bool  is_instruction_DECL(goto_programt::instructiont const&  I)
 
 static bool  is_instruction_DECL_temporary(
     goto_programt::instructiont const&  I,
-    const namespace_utilst &nsu)
+    const symbol_utilst &nsu)
 {
   return I.type==DECL
     && nsu.is_auxiliary_variable(to_code_decl(I.code).symbol());
 }
 
 static bool  is_instruction_assignment_to_temporary(
     goto_programt::instructiont const&  I,
-    const namespace_utilst &nsu)
+    const symbol_utilst &nsu)
 {
   if (I.type == ASSIGN)
   {
@@ -391,7 +391,7 @@ void  taint_statisticst::end_goto_program_building(
           fn_stats.on_clear_may(I.location_number);
     }
 
-  namespace_utilst nsu(program.get_namespace());
+  symbol_utilst nsu(program.get_namespace());
   for(const auto &name_fn : program.get_functions().function_map)
     if(!name_fn.second.body.instructions.empty())
     {

src/taint-analysis/taint_summary.cpp

@@ -26,7 +26,7 @@ This module defines interfaces and functionality for taint summaries.
 #include <util/parameter_indices.h>
 #include <util/simplify_expr.h>
 #include <util/expr_util.h>
-#include <util/namespace_utils.h>
+#include <util/symbol_utils.h>
 #include <analyses/ai.h>
 #include <vector>
 #include <algorithm>
@@ -39,7 +39,7 @@ This module defines interfaces and functionality for taint summaries.
 
 
 // TODO: move this function to some more related module.
-static bool is_pure_local(exprt const& lvalue, namespace_utilst const& nsu)
+static bool is_pure_local(exprt const& lvalue, symbol_utilst const& nsu)
 {
   return lvalue.id()!=ID_member &&
     lvalue.id()!=ID_external_value_set &&
@@ -455,7 +455,7 @@ void  taint_algorithm_computing_summary_of_functiont::
   {
     lvalue_numbers_sett  argument_lvalues;
 
-    if(namespace_utilst(program->get_namespace()).is_parameter(
+    if(symbol_utilst(program->get_namespace()).is_parameter(
       numbering->at(input.first)))
     {
       std::size_t  param_idx;
@@ -519,7 +519,7 @@ void taint_algorithm_computing_summary_of_functiont::
     if(lvalue.is_nil())
       continue;
     lvalue_numbers_sett argument_lvalues;
-    if(namespace_utilst(program->get_namespace()).is_parameter(lvalue))
+    if(symbol_utilst(program->get_namespace()).is_parameter(lvalue))
     {
       std::size_t param_idx;
       {
@@ -650,7 +650,7 @@ void taint_algorithm_computing_summary_of_functiont::initialise_domain(
         for(const std::pair<taint_lvalue_numbert, taint_variablet>& input
           : summary->get_input())
         {
-          if(namespace_utilst(program->get_namespace())
+          if(symbol_utilst(program->get_namespace())
             .is_parameter(numbering->at(input.first)))
           {
             // Collect access paths for the corresponding actual argument:
@@ -673,9 +673,9 @@ void taint_algorithm_computing_summary_of_functiont::initialise_domain(
               it,
               *numbering);
           }
-          else if(!namespace_utilst(program->get_namespace()).is_parameter(
+          else if(!symbol_utilst(program->get_namespace()).is_parameter(
             numbering->at(input.first)) &&
-            !namespace_utilst(program->get_namespace())
+            !symbol_utilst(program->get_namespace())
               .is_return_value_auxiliary(numbering->at(input.first)))
           {
             environment.insert(input.first);
@@ -704,8 +704,8 @@ void taint_algorithm_computing_summary_of_functiont::initialise_domain(
     const taint_lvaluet &lvalue=numbering->at(lvaluenum);
     // This is an output parameter to get_this passed by reference
     const code_typet::parametert *possible_fn_this;
-    if(!is_pure_local(lvalue, program->get_namespace())
-      && !namespace_utilst(program->get_namespace()).
+    if(!is_pure_local(lvalue, symbol_utilst(program->get_namespace()))
+      && !symbol_utilst(program->get_namespace()).
         is_return_value_auxiliary(lvalue)
       && !(!function.type.get_this(possible_fn_this) &&
         &lvalue==possible_fn_this)
@@ -1319,10 +1319,10 @@ void taint_algorithm_computing_summary_of_functiont::
       continue;
 
     const auto &lvalue=numbering->at(end_value.first);
-    if(is_pure_local(lvalue, program->get_namespace()))
+    if(is_pure_local(lvalue, symbol_utilst(program->get_namespace())))
         continue;
 
-    if(namespace_utilst(program->get_namespace()).is_parameter(lvalue) &&
+    if(symbol_utilst(program->get_namespace()).is_parameter(lvalue) &&
         lvalue.type().id()!=ID_pointer)
       continue;
 

src/taint-analysis/taint_trace_recogniser.cpp

@@ -19,7 +19,7 @@ data stored in the databese of taint summaries.
 #include <taint-analysis/taint_statistics.h>
 #include <util/parameter_indices.h>
 #include <util/message.h>
-#include <util/namespace_utils.h>
+#include <util/symbol_utils.h>
 #include <set>
 #include <deque>
 #include <limits>
@@ -556,7 +556,7 @@ void taint_algorithm_recognising_error_tracest::taint_recognise_error_traces(
       }
     }
 
-    namespace_utilst nsu(program.get_namespace());
+    symbol_utilst nsu(program.get_namespace());
     numbered_lvalue_to_taint_mapt lvalue_to_taint_map;
     {
       {