Delete debug outputs and coding style update

Author: zhixing-xu

regression/goto-analyzer/dependence-graph13/main.c

@@ -1,5 +1,3 @@
-#include <assert.h>
-
 void bar(int a, int b)
 {
    int result = b;
@@ -12,4 +10,3 @@ void main()
     int c = 3;
     bar(a, b + c);
 }
-

regression/goto-analyzer/dependence-graph13/test.desc

@@ -4,9 +4,7 @@ main.c
 activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
-// Assignment has a data dependency on the assignment of b
 \/\/ ([0-9]+).*\n.*b = 2;(.*\n)*Data dependencies: (([0-9]+,\1)|(\1,[0-9]+))\n(.*\n){2,3}.*result = b
-// Assignment has a data dependency on the assignment of c
 \/\/ ([0-9]+).*\n.*c = 3;(.*\n)*Data dependencies: (([0-9]+,\1)|(\1,[0-9]+))\n(.*\n){2,3}.*result = b
 --
 ^warning: ignoring

src/analyses/dependence_graph.cpp

@@ -21,7 +21,6 @@ Date: August 2013
 #include <util/json_expr.h>
 
 #include "goto_rw.h"
-#include <iostream>
 
 bool dep_graph_domaint::merge(
   const dep_graph_domaint &src,
@@ -165,14 +164,13 @@ void dep_graph_domaint::data_dependencies(
     dep_graph.reaching_definitions().get_value_sets();
   rw_range_set_value_sett rw_set(ns, value_sets);
   goto_rw(to, rw_set);
-  std::cerr << "\ndata_deps from " << from->location_number << " to " << to->location_number << "\n";
 
   forall_rw_range_set_r_objects(it, rw_set)
   {
-    std::cerr << "Checking for symbol : " << it->first << "\n";
     const range_domaint &r_ranges=rw_set.get_ranges(it);
     const rd_range_domaint::ranges_at_loct &w_ranges=
       dep_graph.reaching_definitions()[to].get(it->first);
+
     for(const auto &w_range : w_ranges)
     {
       bool found=false;
@@ -184,7 +182,6 @@ void dep_graph_domaint::data_dependencies(
           {
             // found a def-use pair
             data_deps.insert(w_range.first);
-            std::cerr << " insert data_deps " << w_range.first->location_number << "\n";
             found=true;
           }
     }

src/analyses/goto_rw.h

@@ -118,9 +118,8 @@ class rw_range_sett
   virtual ~rw_range_sett();
 
   explicit rw_range_sett(const namespacet &_ns):
-    ns(_ns)
+    ns(_ns), is_get_expr_r_set(false)
   {
-    is_get_expr_r_set = false;
   }
 
   const objectst &get_r_set() const

src/analyses/reaching_definitions.cpp

@@ -20,13 +20,11 @@ Date: February 2013
 #include <util/pointer_offset_size.h>
 #include <util/prefix.h>
 #include <util/make_unique.h>
-#include <util/find_symbols.h>
 
 #include <pointer-analysis/value_set_analysis_fi.h>
 
 #include "is_threaded.h"
 #include "dirty.h"
-#include <iostream>
 
 reaching_definitions_analysist::reaching_definitions_analysist(
   const namespacet &_ns):
@@ -174,7 +172,6 @@ void rd_range_domaint::transform_function_call(
   reaching_definitions_analysist &rd)
 {
   const code_function_callt &code=to_code_function_call(from->code);
-  std::cerr << "\ntransform function call from " << from->location_number << " to " << to->location_number << "\n";
 
   // only if there is an actual call, i.e., we have a body
   if(from->function != to->function)
@@ -206,12 +203,7 @@ void rd_range_domaint::transform_function_call(
     const code_typet &code_type=
       to_code_type(ns.lookup(fn_symbol_expr.get_identifier()).type);
 
-    std::cerr << "function name :" << fn_symbol_expr.get_identifier() << "\n";
-
     rw_range_set_value_sett rw_set(ns, rd.get_value_sets());
-    //goto_rw(from, rw_set);
-    rw_set.output(std::cout);
-    //const rw_range_sett::objectst r_objects = rw_set.get_r_set();
 
     PRECONDITION(code_type.parameters().size() == code.arguments().size());
     auto param = code_type.parameters().begin();
@@ -225,20 +217,15 @@ void rd_range_domaint::transform_function_call(
       if(identifier.empty())
         continue;
 
-      std::cout << " param name: " << identifier << "\n";
       // get read set of the argument
       rw_set.set_expr_r_set();
       rw_set.get_objects_rec(from, rw_range_sett::get_modet::READ, *arg);
-      std::cout << " argument set: \n";
-      for(rw_range_sett::objectst::const_iterator
-          it=(rw_set).get_expr_r_set().begin();
-          it!=(rw_set).get_expr_r_set().end(); ++it)
+      for(const auto &r_set_pair : (rw_set).get_expr_r_set())
       {
-        std::cout << it->first << ":";
-        const rd_range_domaint::ranges_at_loct &w_ranges = rd[from].get(it->first);
+        const rd_range_domaint::ranges_at_loct &w_ranges
+          = rd[from].get(r_set_pair.first);
         for(const auto &w_range : w_ranges)
         {
-          std::cerr << " further dep on: " << w_range.first->location_number << "\n";
           for(const auto &wr : w_range.second)
             gen(w_range.first, identifier, wr.first, wr.second);
         }
@@ -332,10 +319,8 @@ void rd_range_domaint::transform_assign(
   locationt to,
   reaching_definitions_analysist &rd)
 {
-  std::cerr << "\ntransform assign from " << from->location_number << " to " << to->location_number << "\n";
   rw_range_set_value_sett rw_set(ns, rd.get_value_sets());
   goto_rw(to, rw_set);
-  rw_set.output(std::cerr);
   const bool is_must_alias=rw_set.get_w_set().size()==1;
 
   forall_rw_range_set_w_objects(it, rw_set)