Merge pull request #906 from allredj/java-string-preprocess

Complete overhaul of preprocessing of Java strings

Author: forejtv

src/cbmc/cbmc_parse_options.cpp

@@ -20,7 +20,6 @@ Author: Daniel Kroening, [email protected]
 #include <ansi-c/c_preprocess.h>
 
 #include <goto-programs/goto_convert_functions.h>
-#include <goto-programs/string_refine_preprocess.h>
 #include <goto-programs/remove_function_pointers.h>
 #include <goto-programs/remove_virtual_functions.h>
 #include <goto-programs/remove_instanceof.h>
@@ -905,14 +904,6 @@ bool cbmc_parse_optionst::process_goto_program(
     status() << "Partial Inlining" << eom;
     goto_partial_inline(goto_functions, ns, ui_message_handler);
 
-
-    if(cmdline.isset("refine-strings"))
-    {
-      status() << "Preprocessing for string refinement" << eom;
-      string_refine_preprocesst(
-        symbol_table, goto_functions, ui_message_handler);
-    }
-
     // remove returns, gcc vectors, complex
     remove_returns(symbol_table, goto_functions);
     remove_vector(symbol_table, goto_functions);

src/goto-programs/Makefile

@@ -58,7 +58,6 @@ SRC = basic_blocks.cpp \
       slice_global_inits.cpp \
       string_abstraction.cpp \
       string_instrumentation.cpp \
-      string_refine_preprocess.cpp \
       system_library_symbols.cpp \
       vcd_goto_trace.cpp \
       wp.cpp \