Small fixes

for CI

Author: petr-bauch

src/goto-programs/c_string_refinement.cpp

@@ -11,6 +11,7 @@ Author: diffblue
 
 #include "c_string_refinement.h"
 #include "arith_tools.h"
+#include "cprover_prefix.h"
 #include "irep_ids.h"
 #include "std_expr.h"
 
@@ -88,15 +89,15 @@ void c_string_refinementt::operator()(goto_functionst &goto_functions)
       it != goto_functions.function_map.end();
       it++)
   {
-    if(it->first == "__CPROVER_math_func_string_index_of")
+    if(it->first == CPROVER_PREFIX "math_func_string_index_of")
     {
       do_string_index_of(it->second);
     }
-    else if(it->first == "__CPROVER_math_func_string_substring")
+    else if(it->first == CPROVER_PREFIX "math_func_string_substring")
     {
       do_string_substring(it->second);
     }
-    else if(it->first == "__CPROVER_math_func_string_concat")
+    else if(it->first == CPROVER_PREFIX "math_func_string_concat")
     {
       do_string_concat(it->second);
     }

src/solvers/strings/string_constraint_generator_indexof.cpp

@@ -42,7 +42,6 @@ string_constraint_generatort::add_axioms_for_index_of(
 {
   string_constraintst constraints;
   const typet &index_type = from_index.type();
-  //const typet &size_type = str.length_type();
   symbol_exprt index = fresh_symbol("index_of", index_type);
   symbol_exprt contains = fresh_symbol("contains_in_index_of");
 
@@ -311,9 +310,9 @@ string_constraint_generatort::add_axioms_for_index_of(
   PRECONDITION(args.size() == 2 || args.size() == 3);
   const array_string_exprt str = get_string_expr(array_pool, args[0]);
   const exprt &c = args[1];
-  const typet &index_type = f.type(); //str.length_type();
+  const typet &index_type = f.type();
   const typet &char_type = str.content().type().subtype();
-  //PRECONDITION(f.type() == index_type);
+
   const exprt from_index =
     args.size() == 2 ? from_integer(0, index_type) : args[2];
 

src/solvers/strings/string_refinement_util.cpp

@@ -7,7 +7,6 @@ Author: Diffblue Ltd.
 \*******************************************************************/
 
 #include "string_refinement_util.h"
-#include "irep_ids.h"
 #include "string_format_builtin_function.h"
 #include <algorithm>
 #include <functional>