Merge pull request diffblue#2187 from diffblue/move-convert-nondet

Move convert_nondet to java_bytecode

Author: Daniel Kroening

src/cbmc/cbmc_parse_options.cpp

@@ -26,7 +26,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/c_preprocess.h>
 
-#include <goto-programs/convert_nondet.h>
 #include <goto-programs/initialize_goto_model.h>
 #include <goto-programs/instrument_preconditions.h>
 #include <goto-programs/goto_convert_functions.h>

src/goto-programs/Makefile

@@ -3,7 +3,6 @@ SRC = basic_blocks.cpp \
       class_hierarchy.cpp \
       class_identifier.cpp \
       compute_called_functions.cpp \
-      convert_nondet.cpp \
       destructor.cpp \
       elf_reader.cpp \
       format_strings.cpp \

src/java_bytecode/Makefile

@@ -2,6 +2,7 @@ SRC = bytecode_info.cpp \
       character_refine_preprocess.cpp \
       ci_lazy_methods.cpp \
       ci_lazy_methods_needed.cpp \
+      convert_java_nondet.cpp \
       expr2java.cpp \
       generic_parameter_specialization_map_keys.cpp \
       jar_file.cpp \

src/goto-programs/convert_nondet.cpp renamed to src/java_bytecode/convert_java_nondet.cpp

@@ -9,18 +9,19 @@ Author: Reuben Thomas, [email protected]
 /// \file
 /// Convert side_effect_expr_nondett expressions
 
-#include "convert_nondet.h"
-#include "goto_convert.h"
-#include "goto_model.h"
-#include "remove_skip.h"
+#include "convert_java_nondet.h"
 
-#include <java_bytecode/java_object_factory.h> // gen_nondet_init
+#include <goto-programs/goto_convert.h>
+#include <goto-programs/goto_model.h>
+#include <goto-programs/remove_skip.h>
 
-#include <util/irep_ids.h>
 #include <util/fresh_symbol.h>
+#include <util/irep_ids.h>
 
 #include <memory>
 
+#include "java_object_factory.h" // gen_nondet_init
+
 /// Checks an instruction to see whether it contains an assignment from
 /// side_effect_expr_nondet.  If so, replaces the instruction with a range of
 /// instructions to properly nondet-initialize the lhs.

src/goto-programs/convert_nondet.h renamed to src/java_bytecode/convert_java_nondet.h

@@ -9,8 +9,8 @@ Author: Reuben Thomas, [email protected]
 /// \file
 /// Convert side_effect_expr_nondett expressions
 
-#ifndef CPROVER_GOTO_PROGRAMS_CONVERT_NONDET_H
-#define CPROVER_GOTO_PROGRAMS_CONVERT_NONDET_H
+#ifndef CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H
+#define CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H
 
 #include <cstddef> // size_t
 #include <util/irep.h>
@@ -52,4 +52,4 @@ void convert_nondet(
   const object_factory_parameterst &object_factory_parameters,
   const irep_idt &mode);
 
-#endif
+#endif // CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H

src/jbmc/jbmc_parse_options.cpp

@@ -26,7 +26,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/ansi_c_language.h>
 
-#include <goto-programs/convert_nondet.h>
 #include <goto-programs/lazy_goto_model.h>
 #include <goto-programs/instrument_preconditions.h>
 #include <goto-programs/goto_convert_functions.h>
@@ -54,6 +53,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <langapi/mode.h>
 
+#include <java_bytecode/convert_java_nondet.h>
 #include <java_bytecode/java_bytecode_language.h>
 #include <java_bytecode/java_enum_static_init_unwind_handler.h>
 #include <java_bytecode/remove_exceptions.h>