Merge pull request #1493 from reuk/reuk/output-instruction-const-ref

Replace iterator with const value_type& in output_instruction signature

Author: tautschnig

src/analyses/ai.cpp

@@ -122,7 +122,7 @@ void ai_baset::output(
     find_state(i_it).output(out, *this, ns);
     out << "\n";
     #if 1
-    goto_program.output_instruction(ns, identifier, out, i_it);
+    goto_program.output_instruction(ns, identifier, out, *i_it);
     out << "\n";
     #endif
   }
@@ -174,7 +174,7 @@ jsont ai_baset::output_json(
 
     // Ideally we need output_instruction_json
     std::ostringstream out;
-    goto_program.output_instruction(ns, identifier, out, i_it);
+    goto_program.output_instruction(ns, identifier, out, *i_it);
     location["instruction"]=json_stringt(out.str());
 
     contents.push_back(location);
@@ -235,7 +235,7 @@ xmlt ai_baset::output_xml(
 
     // Ideally we need output_instruction_xml
     std::ostringstream out;
-    goto_program.output_instruction(ns, identifier, out, i_it);
+    goto_program.output_instruction(ns, identifier, out, *i_it);
     location.set_attribute("instruction", out.str());
 
     function_body.new_element(location);

src/analyses/local_bitvector_analysis.cpp

@@ -349,7 +349,7 @@ void local_bitvector_analysist::output(
     }
 
     out << "\n";
-    goto_function.body.output_instruction(ns, "", out, i_it);
+    goto_function.body.output_instruction(ns, "", out, *i_it);
     out << "\n";
 
     l++;

src/analyses/local_may_alias.cpp

@@ -466,7 +466,7 @@ void local_may_aliast::output(
     }
 
     out << "\n";
-    goto_function.body.output_instruction(ns, "", out, i_it);
+    goto_function.body.output_instruction(ns, "", out, *i_it);
     out << "\n";
 
     l++;

src/cbmc/symex_bmc.cpp

@@ -108,7 +108,7 @@ bool symex_bmct::get_unwind(
   const symex_targett::sourcet &source,
   unsigned unwind)
 {
-  const irep_idt id=goto_programt::loop_id(source.pc);
+  const irep_idt id=goto_programt::loop_id(*source.pc);
 
   // We use the most specific limit we have,
   // and 'infinity' when we have none.

src/goto-analyzer/unreachable_instructions.cpp

@@ -71,7 +71,7 @@ static void output_dead_plain(
   for(dead_mapt::const_iterator it=dead_map.begin();
       it!=dead_map.end();
       ++it)
-    goto_program.output_instruction(ns, "", os, it->second);
+    goto_program.output_instruction(ns, "", os, *it->second);
 }
 
 static void add_to_json(
@@ -101,7 +101,7 @@ static void add_to_json(
       ++it)
   {
     std::ostringstream oss;
-    goto_program.output_instruction(ns, "", oss, it->second);
+    goto_program.output_instruction(ns, "", oss, *it->second);
     std::string s=oss.str();
 
     std::string::size_type n=s.find('\n');

src/goto-diff/change_impact.cpp

@@ -732,7 +732,7 @@ void change_impactt::output_instruction(char prefix,
   else
   {
     std::cout << prefix;
-    goto_program.output_instruction(ns, function, std::cout, target);
+    goto_program.output_instruction(ns, function, std::cout, *target);
   }
 }
 

src/goto-diff/unified_diff.cpp

@@ -132,27 +132,15 @@ void unified_difft::output_diff(
     {
       case differencet::SAME:
         os << ' ';
-        new_goto_program.output_instruction(
-          ns_new,
-          identifier,
-          os,
-          d.first);
+        new_goto_program.output_instruction(ns_new, identifier, os, *d.first);
         break;
       case differencet::DELETED:
         os << '-';
-        old_goto_program.output_instruction(
-          ns_old,
-          identifier,
-          os,
-          d.first);
+        old_goto_program.output_instruction(ns_old, identifier, os, *d.first);
         break;
       case differencet::NEW:
         os << '+';
-        new_goto_program.output_instruction(
-          ns_new,
-          identifier,
-          os,
-          d.first);
+        new_goto_program.output_instruction(ns_new, identifier, os, *d.first);
         break;
     }
   }

src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.cpp

@@ -65,7 +65,7 @@ bool disjunctive_polynomial_accelerationt::accelerate(
   {
     if(loop.find(it)!=loop.end())
     {
-      goto_program.output_instruction(ns, "scratch", std::cout, it);
+      goto_program.output_instruction(ns, "scratch", std::cout, *it);
     }
   }
 

src/goto-instrument/accelerate/enumerating_loop_acceleration.cpp

@@ -32,7 +32,7 @@ bool enumerating_loop_accelerationt::accelerate(
         it!=path.end();
         ++it)
     {
-      goto_program.output_instruction(ns, "OMG", std::cout, it->loc);
+      goto_program.output_instruction(ns, "OMG", std::cout, *it->loc);
     }
 #endif
 

src/goto-instrument/accelerate/path.cpp

@@ -22,5 +22,5 @@ void output_path(
   std::ostream &str)
 {
   for(const auto &step : path)
-    program.output_instruction(ns, "path", str, step.loc);
+    program.output_instruction(ns, "path", str, *step.loc);
 }