Rearrange cover_basic_blocks header

Use private instead of protected.
Remove typedef used only once.
Document members.
Mark class final.

Author: romainbrenguier

src/goto-instrument/cover_basic_blocks.h

@@ -18,7 +18,7 @@ Author: Daniel Kroening
 
 class message_handlert;
 
-class cover_basic_blockst
+class cover_basic_blockst final
 {
 public:
   explicit cover_basic_blockst(const goto_programt &_goto_program);
@@ -57,28 +57,27 @@ class cover_basic_blockst
   /// Outputs the list of blocks
   void output(std::ostream &out) const;
 
-protected:
-  // map program locations to block numbers
+private:
   typedef std::map<goto_programt::const_targett, unsigned> block_mapt;
-  block_mapt block_map;
 
   struct block_infot
   {
     /// the program location to instrument for this block
     optionalt<goto_programt::const_targett> representative_inst;
 
     /// the source location representative for this block
-    // (we need a separate copy of source locations because we attach
-    //  the line number ranges to them)
+    /// (we need a separate copy of source locations because we attach
+    ///  the line number ranges to them)
     source_locationt source_location;
 
-    // map block numbers to source code locations
     /// the set of lines belonging to this block
     std::unordered_set<unsigned> lines;
   };
 
-  typedef std::vector<block_infot> block_infost;
-  block_infost block_infos;
+  /// map program locations to block numbers
+  block_mapt block_map;
+  /// map block numbers to block information
+  std::vector<block_infot> block_infos;
 
   /// create list of covered lines as CSV string and set as property of source
   /// location of basic block, compress to ranges if applicable