Refer to interface rather than cover_basic_blockst

Author: romainbrenguier

src/goto-instrument/cover_instrument.h

@@ -18,7 +18,7 @@ Author: Peter Schrammel
 #include <util/message.h>
 
 enum class coverage_criteriont;
-class cover_basic_blockst;
+class cover_blocks_baset;
 class goal_filterst;
 
 /// Base class for goto program coverage instrumenters
@@ -40,7 +40,7 @@ class cover_instrumenter_baset
   /// \param basic_blocks: detected basic blocks
   virtual void operator()(
     goto_programt &goto_program,
-    const cover_basic_blockst &basic_blocks) const
+    const cover_blocks_baset &basic_blocks) const
   {
     Forall_goto_program_instructions(i_it, goto_program)
     {
@@ -59,7 +59,7 @@ class cover_instrumenter_baset
   virtual void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const = 0;
+    const cover_blocks_baset &) const = 0;
 
   void initialize_source_location(
     goto_programt::targett t,
@@ -94,13 +94,13 @@ class cover_instrumenterst
   /// \param basic_blocks: detected basic blocks of the goto program
   void operator()(
     goto_programt &goto_program,
-    const cover_basic_blockst &basic_blocks) const
+    const cover_blocks_baset &basic_blocks) const
   {
     for(const auto &instrumenter : instrumenters)
       (*instrumenter)(goto_program, basic_blocks);
   }
 
-protected:
+private:
   std::vector<std::unique_ptr<cover_instrumenter_baset>> instrumenters;
 };
 
@@ -119,7 +119,7 @@ class cover_location_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// Branch coverage instrumenter
@@ -137,7 +137,7 @@ class cover_branch_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// Condition coverage instrumenter
@@ -155,7 +155,7 @@ class cover_condition_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// Decision coverage instrumenter
@@ -173,7 +173,7 @@ class cover_decision_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// MC/DC coverage instrumenter
@@ -191,7 +191,7 @@ class cover_mcdc_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// Path coverage instrumenter
@@ -209,7 +209,7 @@ class cover_path_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// Assertion coverage instrumenter
@@ -227,7 +227,7 @@ class cover_assertion_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 /// __CPROVER_cover coverage instrumenter
@@ -245,7 +245,7 @@ class cover_cover_instrumentert : public cover_instrumenter_baset
   void instrument(
     goto_programt &,
     goto_programt::targett &,
-    const cover_basic_blockst &) const override;
+    const cover_blocks_baset &) const override;
 };
 
 void cover_instrument_end_of_function(

src/goto-instrument/cover_instrument_branch.cpp

@@ -15,7 +15,7 @@ Author: Daniel Kroening
 void cover_branch_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();

src/goto-instrument/cover_instrument_condition.cpp

@@ -14,11 +14,12 @@ Author: Daniel Kroening
 #include <langapi/language_util.h>
 
 #include "cover_util.h"
+#include "cover_basic_blocks.h"
 
 void cover_condition_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();

src/goto-instrument/cover_instrument_decision.cpp

@@ -18,7 +18,7 @@ Author: Daniel Kroening
 void cover_decision_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();

src/goto-instrument/cover_instrument_location.cpp

@@ -17,12 +17,12 @@ Author: Daniel Kroening
 void cover_location_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();
 
-  const unsigned block_nr = basic_blocks.block_of(i_it);
+  const std::size_t block_nr = basic_blocks.block_of(i_it);
   const auto representative_instruction = basic_blocks.instruction_of(block_nr);
   // we only instrument the selected instruction
   if(representative_instruction && *representative_instruction == i_it)

src/goto-instrument/cover_instrument_mcdc.cpp

@@ -639,7 +639,7 @@ void minimize_mcdc_controlling(
 void cover_mcdc_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();

src/goto-instrument/cover_instrument_other.cpp

@@ -18,7 +18,7 @@ Author: Daniel Kroening
 void cover_path_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   if(is_non_cover_assertion(i_it))
     i_it->make_skip();
@@ -29,7 +29,7 @@ void cover_path_instrumentert::instrument(
 void cover_assertion_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   // turn into 'assert(false)' to avoid simplification
   if(is_non_cover_assertion(i_it))
@@ -43,7 +43,7 @@ void cover_assertion_instrumentert::instrument(
 void cover_cover_instrumentert::instrument(
   goto_programt &goto_program,
   goto_programt::targett &i_it,
-  const cover_basic_blockst &basic_blocks) const
+  const cover_blocks_baset &basic_blocks) const
 {
   // turn __CPROVER_cover(x) into 'assert(!x)'
   if(i_it->is_function_call())