Merge pull request diffblue#1887 from diffblue/string-constant-to-util

move ansi-c/string_constant.h to util/

Author: Daniel Kroening

src/ansi-c/Makefile

@@ -35,7 +35,6 @@ SRC = anonymous_member.cpp \
       padding.cpp \
       preprocessor_line.cpp \
       printf_formatter.cpp \
-      string_constant.cpp \
       type2name.cpp \
       # Empty last line
 

src/ansi-c/ansi_c_entry_point.cpp

@@ -11,18 +11,17 @@ Author: Daniel Kroening, [email protected]
 #include <cassert>
 #include <cstdlib>
 
-#include <util/namespace.h>
-#include <util/std_expr.h>
 #include <util/arith_tools.h>
-#include <util/std_code.h>
+#include <util/c_types.h>
 #include <util/config.h>
 #include <util/cprover_prefix.h>
+#include <util/namespace.h>
 #include <util/prefix.h>
+#include <util/std_code.h>
+#include <util/std_expr.h>
+#include <util/string_constant.h>
 #include <util/symbol.h>
 
-#include <util/c_types.h>
-#include <ansi-c/string_constant.h>
-
 #include <goto-programs/goto_functions.h>
 #include <linking/static_lifetime_init.h>
 

src/ansi-c/c_nondet_symbol_factory.cpp

@@ -17,17 +17,16 @@ Author: DiffBlue Limited. All rights reserved.
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/fresh_symbol.h>
-#include <util/std_types.h>
-#include <util/std_code.h>
-#include <util/std_expr.h>
 #include <util/namespace.h>
 #include <util/pointer_offset_size.h>
 #include <util/prefix.h>
+#include <util/std_code.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
+#include <util/string_constant.h>
 
 #include <linking/zero_initializer.h>
 
-#include <ansi-c/string_constant.h>
-
 #include <goto-programs/goto_functions.h>
 
 /// Create a new temporary static symbol

src/ansi-c/c_typecheck_expr.cpp

@@ -22,12 +22,12 @@ Author: Daniel Kroening, [email protected]
 #include <util/simplify_expr.h>
 #include <util/base_type.h>
 #include <util/std_expr.h>
+#include <util/string_constant.h>
 #include <util/pointer_offset_size.h>
 #include <util/pointer_predicates.h>
 
 #include "c_typecast.h"
 #include "c_qualifiers.h"
-#include "string_constant.h"
 #include "anonymous_member.h"
 #include "padding.h"
 

src/ansi-c/c_typecheck_initializer.cpp

@@ -13,15 +13,15 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/arith_tools.h>
 #include <util/c_types.h>
-#include <util/type_eq.h>
-#include <util/std_types.h>
-#include <util/simplify_expr.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
+#include <util/simplify_expr.h>
+#include <util/std_types.h>
+#include <util/string_constant.h>
+#include <util/type_eq.h>
 
 #include <linking/zero_initializer.h>
 
-#include "string_constant.h"
 #include "anonymous_member.h"
 
 void c_typecheck_baset::do_initializer(

src/ansi-c/literals/convert_string_literal.cpp

@@ -16,8 +16,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/unicode.h>
-
-#include "../string_constant.h"
+#include <util/string_constant.h>
 
 #include "unescape_string.h"
 

src/ansi-c/scanner.l

@@ -19,10 +19,10 @@
 static int isatty(int) { return 0; }
 #endif
 
+#include <util/string_constant.h>
 #include <util/unicode.h>
 
 #include "preprocessor_line.h"
-#include "string_constant.h"
 
 #include "literals/convert_float_literal.h"
 #include "literals/convert_integer_literal.h"

src/cpp/cpp_typecheck_resolve.cpp

@@ -14,13 +14,13 @@ Author: Daniel Kroening, [email protected]
 #include <cstdlib>
 #include <algorithm>
 
-#include <util/std_types.h>
-#include <util/std_expr.h>
 #include <util/arith_tools.h>
+#include <util/c_types.h>
 #include <util/prefix.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
+#include <util/string_constant.h>
 
-#include <util/c_types.h>
-#include <ansi-c/string_constant.h>
 #include <ansi-c/anonymous_member.h>
 
 #include "cpp_typecheck.h"

src/goto-analyzer/taint_analysis.cpp

@@ -14,11 +14,10 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #include <fstream>
 
+#include <util/json.h>
 #include <util/prefix.h>
 #include <util/simplify_expr.h>
-#include <util/json.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 #include <goto-programs/class_hierarchy.h>
 

src/goto-instrument/function.cpp

@@ -12,12 +12,11 @@ Author: Daniel Kroening, [email protected]
 #include "function.h"
 
 #include <util/arith_tools.h>
+#include <util/c_types.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
 #include <util/std_expr.h>
-
-#include <util/c_types.h>
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 code_function_callt function_to_call(
   symbol_tablet &symbol_table,

src/goto-instrument/thread_instrumentation.cpp

@@ -9,8 +9,7 @@ Author: Daniel Kroening, [email protected]
 #include "thread_instrumentation.h"
 
 #include <util/c_types.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 #include <goto-programs/goto_model.h>
 

src/goto-programs/builtin_functions.cpp

@@ -13,25 +13,24 @@ Author: Daniel Kroening, [email protected]
 
 #include <cassert>
 
+#include <util/arith_tools.h>
 #include <util/c_types.h>
-#include <util/rational.h>
-#include <util/replace_expr.h>
-#include <util/rational_tools.h>
-#include <util/source_location.h>
 #include <util/cprover_prefix.h>
+#include <util/pointer_offset_size.h>
+#include <util/pointer_predicates.h>
 #include <util/prefix.h>
-#include <util/arith_tools.h>
+#include <util/rational.h>
+#include <util/rational_tools.h>
+#include <util/replace_expr.h>
 #include <util/simplify_expr.h>
+#include <util/source_location.h>
 #include <util/std_code.h>
 #include <util/std_expr.h>
+#include <util/string_constant.h>
 #include <util/symbol.h>
-#include <util/pointer_predicates.h>
-#include <util/pointer_offset_size.h>
 
 #include <linking/zero_initializer.h>
 
-#include <ansi-c/string_constant.h>
-
 #include <langapi/language_util.h>
 
 #include "format_strings.h"

src/goto-programs/remove_asm.cpp

@@ -18,8 +18,8 @@ Date:   December 2014
 
 #include <util/c_types.h>
 #include <util/std_expr.h>
+#include <util/string_constant.h>
 
-#include <ansi-c/string_constant.h>
 #include <assembler/assembler_parser.h>
 
 class remove_asmt

src/java_bytecode/java_bytecode_parser.cpp

@@ -13,13 +13,12 @@ Author: Daniel Kroening, [email protected]
 #include <map>
 #include <string>
 
-#include <util/parser.h>
-#include <util/std_expr.h>
 #include <util/arith_tools.h>
 #include <util/ieee_float.h>
+#include <util/parser.h>
 #include <util/prefix.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/std_expr.h>
+#include <util/string_constant.h>
 
 #include "java_bytecode_parse_tree.h"
 #include "java_types.h"

src/java_bytecode/java_entry_point.cpp

@@ -16,20 +16,19 @@ Author: Daniel Kroening, [email protected]
 #include <linking/static_lifetime_init.h>
 
 #include <util/arith_tools.h>
-#include <util/prefix.h>
-#include <util/std_types.h>
-#include <util/std_code.h>
-#include <util/std_expr.h>
+#include <util/c_types.h>
+#include <util/config.h>
 #include <util/cprover_prefix.h>
 #include <util/message.h>
-#include <util/config.h>
 #include <util/namespace.h>
 #include <util/pointer_offset_size.h>
+#include <util/prefix.h>
+#include <util/std_code.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
+#include <util/string_constant.h>
 #include <util/suffix.h>
 
-#include <util/c_types.h>
-#include <ansi-c/string_constant.h>
-
 #include <goto-programs/remove_exceptions.h>
 
 #include "java_object_factory.h"

src/jsil/parser.y

@@ -13,8 +13,7 @@ extern char *yyjsiltext;
 
 #include <util/std_expr.h>
 #include <util/std_code.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 #include "jsil_y.tab.h"
 /*** token declaration **************************************************/

src/solvers/cvc/cvc_conv.cpp

@@ -14,13 +14,12 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/arith_tools.h>
 #include <util/c_types.h>
-#include <util/std_types.h>
-#include <util/std_expr.h>
 #include <util/find_symbols.h>
 #include <util/pointer_offset_size.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
 #include <util/string2int.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 void cvc_convt::print_assignment(std::ostream &out) const
 {

src/solvers/flattening/boolbv.cpp

@@ -12,18 +12,17 @@ Author: Daniel Kroening, [email protected]
 #include <map>
 #include <set>
 
-#include <util/symbol.h>
-#include <util/mp_arith.h>
 #include <util/arith_tools.h>
 #include <util/magic.h>
-#include <util/replace_expr.h>
-#include <util/std_types.h>
+#include <util/mp_arith.h>
 #include <util/prefix.h>
+#include <util/replace_expr.h>
 #include <util/std_expr.h>
-#include <util/threeval.h>
+#include <util/std_types.h>
 #include <util/string2int.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
+#include <util/symbol.h>
+#include <util/threeval.h>
 
 #include "boolbv_type.h"
 

src/solvers/refinement/string_constraint_generator_constants.cpp

@@ -11,8 +11,8 @@ Author: Romain Brenguier, [email protected]
 
 #include <solvers/refinement/string_constraint_generator.h>
 
-#include <ansi-c/string_constant.h>
 #include <util/prefix.h>
+#include <util/string_constant.h>
 #include <util/unicode.h>
 
 /// Add axioms ensuring that the provided string expression and constant are

src/solvers/refinement/string_constraint_generator_main.cpp

@@ -20,12 +20,13 @@ Author: Romain Brenguier, [email protected]
 #include <solvers/refinement/string_constraint_generator.h>
 
 #include <limits>
-#include <ansi-c/string_constant.h>
 #include <java_bytecode/java_types.h>
 #include <solvers/refinement/string_refinement_invariant.h>
+
 #include <util/arith_tools.h>
 #include <util/pointer_predicates.h>
 #include <util/ssa_expr.h>
+#include <util/string_constant.h>
 
 string_constraint_generatort::string_constraint_generatort(
   const string_constraint_generatort::infot &info,

src/solvers/smt1/smt1_conv.cpp

@@ -14,17 +14,16 @@ Author: Daniel Kroening, [email protected]
 #include <cassert>
 
 #include <util/arith_tools.h>
-#include <util/std_types.h>
-#include <util/std_expr.h>
-#include <util/fixedbv.h>
-#include <util/pointer_offset_size.h>
 #include <util/base_type.h>
-#include <util/ieee_float.h>
 #include <util/byte_operators.h>
-#include <util/config.h>
 #include <util/c_types.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/config.h>
+#include <util/fixedbv.h>
+#include <util/ieee_float.h>
+#include <util/pointer_offset_size.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
+#include <util/string_constant.h>
 
 #include <langapi/language_util.h>
 

src/solvers/smt2/smt2_conv.cpp

@@ -16,17 +16,16 @@ Author: Daniel Kroening, [email protected]
 #include <util/arith_tools.h>
 #include <util/base_type.h>
 #include <util/c_types.h>
+#include <util/config.h>
 #include <util/expr_util.h>
 #include <util/fixedbv.h>
 #include <util/ieee_float.h>
 #include <util/invariant.h>
-#include <util/config.h>
 #include <util/pointer_offset_size.h>
-#include <util/std_types.h>
 #include <util/std_expr.h>
+#include <util/std_types.h>
 #include <util/string2int.h>
-
-#include <ansi-c/string_constant.h>
+#include <util/string_constant.h>
 
 #include <langapi/language_util.h>
 

src/util/Makefile

@@ -74,6 +74,7 @@ SRC = arith_tools.cpp \
       std_expr.cpp \
       std_types.cpp \
       string2int.cpp \
+      string_constant.cpp \
       string_container.cpp \
       string_hash.cpp \
       string_utils.cpp \

src/ansi-c/string_constant.cpp renamed to src/util/string_constant.cpp

@@ -8,9 +8,9 @@ Author: Daniel Kroening, [email protected]
 
 #include "string_constant.h"
 
-#include <util/arith_tools.h>
-#include <util/c_types.h>
-#include <util/std_expr.h>
+#include "arith_tools.h"
+#include "c_types.h"
+#include "std_expr.h"
 
 string_constantt::string_constantt():
   exprt(ID_string_constant)