Updates requested in the PR.

Author: marek-trtik

src/taint-slicer/instrumentation_props.cpp

@@ -32,7 +32,6 @@ instrumentation_props data structure.
 bool is_primitive_type(const typet &type)
 {
   return type==java_boolean_type() ||
-         type==java_boolean_type() ||
          type==java_byte_type() ||
          type==java_char_type() ||
          type==java_short_type() ||
@@ -42,12 +41,12 @@ bool is_primitive_type(const typet &type)
          type==java_double_type();
 }
 
-std::string parse_type_name(const typet &type, const namespacet &ns)
+std::string unwrap_type_name(const typet &type, const namespacet &ns)
 {
   if(type.id()==ID_pointer)
-    return parse_type_name(to_pointer_type(type).subtype(), ns);
+    return unwrap_type_name(to_pointer_type(type).subtype(), ns);
   if(type.id()==ID_array)
-    return parse_type_name(to_array_type(type).subtype(), ns);
+    return unwrap_type_name(to_array_type(type).subtype(), ns);
   if(type.id()==ID_symbol)
     return as_string(to_symbol_type(type).get_identifier());
   const std::string result=type2java(type, ns);
@@ -175,6 +174,11 @@ Function: build_map_from_typenames_to_tokennames
  Outputs:
 
  Purpose:
+  The function fills in the member map "datatypes" so that for each
+  data type (identified by its type name, see "unwrap_type_name") to be
+  instrumented by a shadow variable there is computed an instance of
+  "taint_instrumentation_propst::datatype_infot" type holding details
+  about the instrumentation of the shadow variable into that type.
 
 \*******************************************************************/
 void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
@@ -192,7 +196,6 @@ void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
     const std::string callee_ident = as_string(callee_id);
     const code_typet &fn_type =
       program.get_functions().function_map.at(callee_id).type;
-    (void)fn_type;
 
     std::set<argidx_and_tokennamet> to_process;
     for(const auto &elem : loc.get_assumption())
@@ -204,16 +207,18 @@ void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
 
     for(const auto& arg_token : to_process)
     {
-      assert(arg_token.get_argidx()!=
-             taint_tokens_propagation_grapht::get_void_loc());
+      assert(
+        arg_token.get_argidx()!=
+        taint_tokens_propagation_grapht::get_void_loc());
       std::string datatype;
       typet type;
       if(arg_token.get_argidx()==-1) // Return value?
         type=get_return_type_from_function_name(
-              callee_ident, program.get_symbol_table());
+          callee_ident,
+          program.get_symbol_table());
       else
         type=fn_type.parameters().at(arg_token.get_argidx()).type();
-      datatype=parse_type_name(type, program.get_namespace());
+      datatype=unwrap_type_name(type, program.get_namespace());
       auto it=datatypes.find(datatype);
       if(it!=datatypes.end())
       {

src/taint-slicer/instrumentation_props.h

@@ -155,7 +155,7 @@ void taint_build_instrumentation_props(
   std::vector<taint_instrumentation_propst> &output);
 
 bool is_primitive_type(const typet &type);
-std::string parse_type_name(const typet &type, const namespacet &ns);
+std::string unwrap_type_name(const typet &type, const namespacet &ns);
 bool is_java_array_type_name(const std::string &datatype);
 bool does_instrumentation_of_type_require_subclass(
   const std::string &datatype, const typet &type);