Move replace_java_nondet to java_bytecode

Author: peterschrammel

src/goto-programs/Makefile

@@ -50,7 +50,6 @@ SRC = basic_blocks.cpp \
       remove_unused_functions.cpp \
       remove_vector.cpp \
       remove_virtual_functions.cpp \
-      replace_java_nondet.cpp \
       generate_function_bodies.cpp \
       resolve_inherited_component.cpp \
       safety_checker.cpp \

src/java_bytecode/Makefile

@@ -31,6 +31,7 @@ SRC = bytecode_info.cpp \
       java_types.cpp \
       java_utils.cpp \
       mz_zip_archive.cpp \
+      replace_java_nondet.cpp \
       remove_exceptions.cpp \
       remove_instanceof.cpp \
       select_pointer_type.cpp \

src/goto-programs/replace_java_nondet.cpp renamed to src/java_bytecode/replace_java_nondet.cpp

@@ -9,12 +9,11 @@ Author: Reuben Thomas, reuben.thomas@diffblue.com
 /// \file
 /// Replace Java Nondet expressions
 
-#include "goto-programs/replace_java_nondet.h"
-#include "goto-programs/goto_convert.h"
-#include "goto-programs/goto_model.h"
-#include "goto-programs/remove_skip.h"
+#include "replace_java_nondet.h"
 
-#include "util/irep_ids.h"
+#include <goto-programs/goto_convert.h>
+#include <goto-programs/goto_model.h>
+#include <goto-programs/remove_skip.h>
 
 #include <algorithm>
 #include <regex>

src/goto-programs/replace_java_nondet.h renamed to src/java_bytecode/replace_java_nondet.h

@@ -9,8 +9,8 @@ Author: Reuben Thomas, reuben.thomas@diffblue.com
 /// \file
 /// Replace Java Nondet expressions
 
-#ifndef CPROVER_GOTO_PROGRAMS_REPLACE_JAVA_NONDET_H
-#define CPROVER_GOTO_PROGRAMS_REPLACE_JAVA_NONDET_H
+#ifndef CPROVER_JAVA_BYTECODE_REPLACE_JAVA_NONDET_H
+#define CPROVER_JAVA_BYTECODE_REPLACE_JAVA_NONDET_H
 
 class goto_modelt;
 class goto_functionst;

src/jbmc/jbmc_parse_options.cpp

@@ -36,7 +36,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <goto-programs/remove_asm.h>
 #include <goto-programs/remove_unused_functions.h>
 #include <goto-programs/remove_skip.h>
-#include <goto-programs/replace_java_nondet.h>
 #include <goto-programs/set_properties.h>
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_symbol_table.h>
@@ -56,6 +55,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <java_bytecode/java_enum_static_init_unwind_handler.h>
 #include <java_bytecode/remove_instanceof.h>
 #include <java_bytecode/remove_exceptions.h>
+#include <java_bytecode/replace_java_nondet.h>
 
 #include <cbmc/version.h>
 

unit/java_bytecode/java_replace_nondet/replace_nondet.cpp

@@ -13,9 +13,9 @@
 #include <goto-programs/goto_convert_functions.h>
 #include <goto-programs/remove_virtual_functions.h>
 #include <goto-programs/remove_returns.h>
-#include <goto-programs/replace_java_nondet.h>
 
 #include <java_bytecode/remove_instanceof.h>
+#include <java_bytecode/replace_java_nondet.h>
 
 #include <util/config.h>
 #include <util/options.h>