Merge pull request diffblue#90 from diffblue/marek/polished_main_function_of_taint_analyser_PR

Polished structure of the main function of the taint analyser.

Author: marek-trtik

src/taint-analysis/taint_security_scanner.cpp

@@ -150,29 +150,12 @@ bool taint_do_security_scan(
       &statistics,
       &logger);
 
-    if(config.is_html_dump_of_program_enabled())
-    {
-      logger.status()
-        << "Saving analysed GOTO program in HTML format (see '"
-        << fileutl_concatenate_file_paths(
-          config.get_output_root_directory(),
-          "goto-program/HTML/index.html")
-        << "')." << messaget::eom;
-
-      dump_goto_program_in_html(
-        program.get_model(),
-        program.get_call_graph(),
-        fileutl_concatenate_file_paths(
-          config.get_output_root_directory(),
-          "goto-program/HTML"));
-    }
-
     if(config.is_html_dump_of_summaries_enabled())
     {
       statistics.begin_dump_of_taint_html_summaries();
 
       logger.status()
-        << "Saving summaries of TAINT analysis in HTML format (see "
+        << "Saving summaries of TAINT analysis in HTML format (see '"
         << fileutl_concatenate_file_paths(
           config.get_taint_summaries_root_directory(),
           "HTML/index.html")
@@ -193,17 +176,15 @@ bool taint_do_security_scan(
             fn_id, summary, false, ostr);
         },
         program.get_model(),
-        program.get_call_graph(),
         fileutl_concatenate_file_paths(
           config.get_taint_summaries_root_directory(),
-          "HTML"),
-        false);
+          "HTML"));
 
       statistics.end_dump_of_taint_html_summaries();
     }
 
     logger.status()
-      << "Saving summaries of TAINT analysis in JSON format (see "
+      << "Saving summaries of TAINT analysis in JSON format (see '"
       << fileutl_concatenate_file_paths(
         config.get_taint_summaries_root_directory(),
         "JSON/__index.json")
@@ -212,7 +193,7 @@ bool taint_do_security_scan(
     taint_summaries.flush();
 
     logger.status()
-      << "Saving summaries of LVSA analysis in JSON format (see "
+      << "Saving summaries of LVSA analysis in JSON format (see '"
       << fileutl_concatenate_file_paths(
         config.get_lvsa_summaries_root_directory(),
         "__index.json")
@@ -223,7 +204,7 @@ bool taint_do_security_scan(
     if(config.is_html_dump_of_statistics_enabled())
     {
       logger.status()
-        << "Saving statistics of the whole analysis in HTML format (see "
+        << "Saving statistics of the whole analysis in HTML format (see '"
         << fileutl_concatenate_file_paths(
           config.get_statistics_root_directory(),
           "HTML/index.html")
@@ -237,7 +218,7 @@ bool taint_do_security_scan(
     }
 
     logger.status()
-      << "Saving statistics of the whole analysis in JSON format (see "
+      << "Saving statistics of the whole analysis in JSON format (see '"
       << fileutl_concatenate_file_paths(
         config.get_statistics_root_directory(),
         "JSON/statistics.json")
@@ -254,6 +235,26 @@ bool taint_do_security_scan(
       taint_dump_statistics_in_JSON(statistics,ostr);
     }
 
+    if(config.is_html_dump_of_program_enabled())
+    {
+      logger.status()
+        << "Saving analysed GOTO program in HTML format (see '"
+        << fileutl_concatenate_file_paths(
+          config.get_output_root_directory(),
+          "goto-program/HTML/index.html")
+        << "')." << messaget::eom;
+
+      dump_goto_program_in_html(
+        program.get_model(),
+        program.get_call_graph(),
+        program.get_class_hierarchy(),
+        program.get_symbol_table(),
+        program.get_inverted_functions_topological_order(),
+        fileutl_concatenate_file_paths(
+          config.get_output_root_directory(),
+          "goto-program/HTML"));
+    }
+
     logger.status() << "The security scanner has finished successfully."
       << messaget::eom;
     return true;