Updates requested in the PR.

Author: marek-trtik

src/goto-programs/goto_statistics.cpp

@@ -11,7 +11,7 @@ Author: Marek Trtik
 
 void goto_statisticst::extend(
   const goto_functionst &functions,
-  const symbol_tablet & table)
+  const symbol_tablet &table)
 {
   for(auto const &elem : functions.function_map)
   {
@@ -45,45 +45,35 @@ void goto_statisticst::extend(
   }
   for(const auto &name_symbol : table.symbols)
   {
-    if(name_symbol.second.is_lvalue and name_symbol.second.is_state_var)
+    if(name_symbol.second.is_lvalue && name_symbol.second.is_state_var)
     {
       if(name_symbol.second.is_auxiliary)
         ++num_auxiliary_variables;
       else
-        ++num_genuine_variables;
+        ++num_user_variables;
     }
   }
 }
 
 jsont to_json(const goto_statisticst &stats)
 {
-  struct localt
-  {
-    static std::string to_string(const std::size_t number)
-    {
-      std::stringstream sstr;
-      sstr << number;
-      return sstr.str();
-    }
-  };
-
   json_objectt json_stats;
   json_stats["num_functions"]=
-    json_numbert(localt::to_string(stats.get_num_functions()));
+    json_numbert(std::to_string(stats.get_num_functions()));
   json_stats["num_instructions"]=
-    json_numbert(localt::to_string(stats.get_num_instructions()));
-  json_stats["num_genuine_variables"]=
-    json_numbert(localt::to_string(stats.get_num_genuine_variables()));
+    json_numbert(std::to_string(stats.get_num_instructions()));
+  json_stats["num_user_variables"]=
+    json_numbert(std::to_string(stats.get_num_user_variables()));
   json_stats["num_auxiliary_variables"]=
-    json_numbert(localt::to_string(stats.get_num_auxiliary_variables()));
+    json_numbert(std::to_string(stats.get_num_auxiliary_variables()));
   json_stats["num_function_calls"]=
-    json_numbert(localt::to_string(stats.get_num_function_calls()));
+    json_numbert(std::to_string(stats.get_num_function_calls()));
   json_stats["num_unconditional_gotos"]=
-    json_numbert(localt::to_string(stats.get_num_unconditional_gotos()));
+    json_numbert(std::to_string(stats.get_num_unconditional_gotos()));
   json_stats["num_conditional_gotos"]=
-    json_numbert(localt::to_string(stats.get_num_conditional_gotos()));
+    json_numbert(std::to_string(stats.get_num_conditional_gotos()));
   json_stats["num_loops"]=
-    json_numbert(localt::to_string(stats.get_num_loops()));
+    json_numbert(std::to_string(stats.get_num_loops()));
 
   return json_stats;
 }

src/goto-programs/goto_statistics.h

@@ -10,7 +10,7 @@ Author: Marek Trtik
 #define CPROVER_GOTO_PROGRAMS_GOTO_STATISTICS_H
 
 /// \file goto-programs/goto_statistics.h
-/// \brief Computation of statistal properties of a GOTO program.
+/// \brief Computation of statistical properties of a GOTO program.
 
 #include <cstddef>
 #include <util/json.h>
@@ -22,7 +22,7 @@ class goto_statisticst
   goto_statisticst():
     num_functions(0UL),
     num_instructions(0UL),
-    num_genuine_variables(0UL),
+    num_user_variables(0UL),
     num_auxiliary_variables(0UL),
     num_function_calls(0UL),
     num_unconditional_gotos(0UL),
@@ -53,9 +53,9 @@ class goto_statisticst
     return num_instructions;
   }
 
-  std::size_t get_num_genuine_variables() const
+  std::size_t get_num_user_variables() const
   {
-    return num_genuine_variables;
+    return num_user_variables;
   }
 
   std::size_t get_num_auxiliary_variables() const
@@ -86,7 +86,7 @@ class goto_statisticst
 private:
   std::size_t num_functions;
   std::size_t num_instructions;
-  std::size_t num_genuine_variables;
+  std::size_t num_user_variables;
   std::size_t num_auxiliary_variables;
   std::size_t num_function_calls;
   std::size_t num_unconditional_gotos;