moving language.h and language_file.h to langapi folder

kroening · kroening · commit d8967f559330 · 2018-02-11T20:13:24.000Z
The languaget API has become excessively cluttered, and will be phased out.
In preparation, the files are moved to the langapi folder.
diff --git a/src/ansi-c/ansi_c_language.h b/src/ansi-c/ansi_c_language.h
@@ -14,9 +14,10 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <memory>
 
-#include <util/language.h>
 #include <util/make_unique.h>
 
+#include <langapi/language.h>
+
 #include "ansi_c_parse_tree.h"
 
 class ansi_c_languaget:public languaget
diff --git a/src/cbmc/cbmc_parse_options.cpp b/src/cbmc/cbmc_parse_options.cpp
@@ -18,12 +18,13 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/string2int.h>
 #include <util/config.h>
-#include <util/language.h>
 #include <util/unicode.h>
 #include <util/memory_info.h>
 #include <util/invariant.h>
 #include <util/exit_codes.h>
 
+#include <langapi/language.h>
+
 #include <ansi-c/c_preprocess.h>
 
 #include <goto-programs/convert_nondet.h>
diff --git a/src/cbmc/cbmc_parse_options.h b/src/cbmc/cbmc_parse_options.h
@@ -14,7 +14,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/ui_message.h>
 #include <util/parse_options.h>
-#include <util/language.h>
+
+#include <langapi/language.h>
 
 #include <analyses/goto_check.h>
 
diff --git a/src/clobber/clobber_parse_options.cpp b/src/clobber/clobber_parse_options.cpp
@@ -17,7 +17,6 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/string2int.h>
 #include <util/config.h>
-#include <util/language.h>
 #include <util/options.h>
 #include <util/memory_info.h>
 
diff --git a/src/cpp/cpp_language.h b/src/cpp/cpp_language.h
@@ -16,9 +16,10 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 
 #include <memory>
 
-#include <util/language.h>
 #include <util/make_unique.h> // unique_ptr
 
+#include <langapi/language.h>
+
 #include "cpp_parse_tree.h"
 
 class cpp_languaget:public languaget
diff --git a/src/goto-analyzer/goto_analyzer_parse_options.cpp b/src/goto-analyzer/goto_analyzer_parse_options.cpp
@@ -46,8 +46,8 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <analyses/interval_domain.h>
 
 #include <langapi/mode.h>
+#include <langapi/language.h>
 
-#include <util/language.h>
 #include <util/options.h>
 #include <util/config.h>
 #include <util/string2int.h>
diff --git a/src/goto-analyzer/goto_analyzer_parse_options.h b/src/goto-analyzer/goto_analyzer_parse_options.h
@@ -103,7 +103,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/ui_message.h>
 #include <util/parse_options.h>
-#include <util/language.h>
+
+#include <langapi/language.h>
 
 #include <goto-programs/goto_model.h>
 #include <goto-programs/show_goto_functions.h>
diff --git a/src/goto-diff/goto_diff_parse_options.cpp b/src/goto-diff/goto_diff_parse_options.cpp
@@ -18,10 +18,11 @@ Author: Peter Schrammel
 
 #include <util/string2int.h>
 #include <util/config.h>
-#include <util/language.h>
 #include <util/options.h>
 #include <util/make_unique.h>
 
+#include <langapi/language.h>
+
 #include <goto-programs/goto_convert_functions.h>
 #include <goto-programs/remove_function_pointers.h>
 #include <goto-programs/remove_returns.h>
diff --git a/src/goto-instrument/dump_c_class.h b/src/goto-instrument/dump_c_class.h
@@ -16,9 +16,9 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <string>
 #include <memory> // unique_ptr
 
-#include <util/language.h>
-
+#include <langapi/language.h>
 #include <langapi/mode.h>
+
 #include <goto-programs/system_library_symbols.h>
 
 class dump_ct
diff --git a/src/goto-instrument/splice_call.cpp b/src/goto-instrument/splice_call.cpp
@@ -14,11 +14,15 @@ Date: July 2017
 // useful for context/ environment setting in arbitrary nodes
 
 #include "splice_call.h"
+
 #include <util/message.h>
 #include <util/string2int.h>
 #include <util/string_utils.h>
-#include <util/language.h>
+
+#include <langapi/language.h>
+
 #include <goto-programs/goto_functions.h>
+
 #include <algorithm>
 
 // split the argument in caller/ callee two-position vector
diff --git a/src/goto-programs/initialize_goto_model.cpp b/src/goto-programs/initialize_goto_model.cpp
@@ -14,12 +14,12 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <fstream>
 #include <iostream>
 
-#include <util/language.h>
 #include <util/config.h>
 #include <util/unicode.h>
 
 #include <langapi/mode.h>
 #include <langapi/language_ui.h>
+#include <langapi/language.h>
 
 #include <goto-programs/rebuild_goto_start_function.h>
 
diff --git a/src/goto-programs/lazy_goto_functions_map.h b/src/goto-programs/lazy_goto_functions_map.h
@@ -7,10 +7,12 @@
 #define CPROVER_GOTO_PROGRAMS_LAZY_GOTO_FUNCTIONS_MAP_H
 
 #include <unordered_set>
+
 #include "goto_functions.h"
 #include "goto_convert_functions.h"
+
 #include <util/message.h>
-#include <util/language_file.h>
+#include <langapi/language_file.h>
 #include <util/journalling_symbol_table.h>
 
 /// Provides a wrapper for a map of lazily loaded goto_functiont.
diff --git a/src/goto-programs/lazy_goto_model.cpp b/src/goto-programs/lazy_goto_model.cpp
@@ -12,9 +12,10 @@
 #include <util/cmdline.h>
 #include <util/config.h>
 #include <util/journalling_symbol_table.h>
-#include <util/language.h>
 #include <util/unicode.h>
 
+#include <langapi/language.h>
+
 #include <fstream>
 
 //! @cond Doxygen_suppress_Lambda_in_initializer_list
diff --git a/src/goto-programs/lazy_goto_model.h b/src/goto-programs/lazy_goto_model.h
@@ -6,7 +6,7 @@
 #ifndef CPROVER_GOTO_PROGRAMS_LAZY_GOTO_MODEL_H
 #define CPROVER_GOTO_PROGRAMS_LAZY_GOTO_MODEL_H
 
-#include <util/language_file.h>
+#include <langapi/language_file.h>
 
 #include "goto_model.h"
 #include "lazy_goto_functions_map.h"
diff --git a/src/goto-programs/rebuild_goto_start_function.cpp b/src/goto-programs/rebuild_goto_start_function.cpp
@@ -8,12 +8,14 @@
 
 #include "rebuild_goto_start_function.h"
 
-#include <util/language.h>
 #include <util/symbol.h>
 #include <util/symbol_table.h>
 #include <util/prefix.h>
 #include <util/cmdline.h>
+
 #include <langapi/mode.h>
+#include <langapi/language.h>
+
 #include <memory>
 
 /// To rebuild the _start function in the event the program was compiled into
diff --git a/src/goto-programs/show_symbol_table.cpp b/src/goto-programs/show_symbol_table.cpp
@@ -14,7 +14,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <iostream>
 #include <memory>
 
-#include <util/language.h>
+#include <langapi/language.h>
 #include <langapi/mode.h>
 
 #include "goto_model.h"
diff --git a/src/java_bytecode/java_bytecode_language.h b/src/java_bytecode/java_bytecode_language.h
@@ -12,10 +12,11 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <memory>
 
-#include <util/language.h>
 #include <util/cmdline.h>
 #include <util/make_unique.h>
 
+#include <langapi/language.h>
+
 #include "ci_lazy_methods.h"
 #include "ci_lazy_methods_needed.h"
 #include "java_class_loader.h"
diff --git a/src/jbmc/jbmc_parse_options.cpp b/src/jbmc/jbmc_parse_options.cpp
@@ -18,11 +18,12 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/string2int.h>
 #include <util/config.h>
-#include <util/language.h>
 #include <util/unicode.h>
 #include <util/memory_info.h>
 #include <util/invariant.h>
 
+#include <langapi/language.h>
+
 #include <ansi-c/ansi_c_language.h>
 
 #include <goto-programs/convert_nondet.h>
diff --git a/src/jbmc/jbmc_parse_options.h b/src/jbmc/jbmc_parse_options.h
@@ -14,7 +14,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/ui_message.h>
 #include <util/parse_options.h>
-#include <util/language.h>
+
+#include <langapi/language.h>
 
 #include <analyses/goto_check.h>
 
diff --git a/src/jsil/jsil_language.h b/src/jsil/jsil_language.h
@@ -14,9 +14,10 @@ Author: Michael Tautschnig, tautschn@amazon.com
 
 #include <memory>
 
-#include <util/language.h>
 #include <util/make_unique.h>
 
+#include <langapi/language.h>
+
 #include "jsil_parse_tree.h"
 
 class jsil_languaget:public languaget
diff --git a/src/langapi/Makefile b/src/langapi/Makefile
@@ -1,5 +1,7 @@
 SRC = language_ui.cpp \
       language_util.cpp \
+      language_file.cpp \
+      language.cpp \
       mode.cpp \
       # Empty last line
 INCLUDES= -I ..
diff --git a/src/langapi/language.cpp b/src/langapi/language.cpp
@@ -11,7 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "language.h"
 
-#include "expr.h"
+#include <util/expr.h>
 #include <util/symbol.h>
 #include <util/symbol_table.h>
 #include <util/prefix.h>
diff --git a/src/langapi/language.h b/src/langapi/language.h
@@ -9,18 +9,19 @@ Author: Daniel Kroening, kroening@kroening.com
 /// \file
 /// Abstract interface to support a programming language
 
-#ifndef CPROVER_UTIL_LANGUAGE_H
-#define CPROVER_UTIL_LANGUAGE_H
+#ifndef CPROVER_LANGAPI_LANGUAGE_H
+#define CPROVER_LANGAPI_LANGUAGE_H
 
 #include <unordered_set>
 #include <iosfwd>
 #include <string>
 #include <memory> // unique_ptr
+
 #include <util/symbol.h>
 #include <util/std_types.h>
-#include <goto-programs/system_library_symbols.h>
+#include <util/message.h>
 
-#include "message.h"
+#include <goto-programs/system_library_symbols.h>
 
 typedef std::unordered_set<irep_idt, irep_id_hash> id_sett;
 
diff --git a/src/langapi/language_file.cpp b/src/langapi/language_file.cpp
diff --git a/src/langapi/language_file.h b/src/langapi/language_file.h
@@ -7,17 +7,18 @@ Author: Daniel Kroening, kroening@kroening.com
 \*******************************************************************/
 
 
-#ifndef CPROVER_UTIL_LANGUAGE_FILE_H
-#define CPROVER_UTIL_LANGUAGE_FILE_H
+#ifndef CPROVER_LANGAPI_LANGUAGE_FILE_H
+#define CPROVER_LANGAPI_LANGUAGE_FILE_H
 
 #include <iosfwd>
 #include <set>
 #include <map>
 #include <string>
 #include <memory> // unique_ptr
 
-#include "message.h"
-#include "symbol_table.h"
+#include <util/message.h>
+#include <util/symbol_table.h>
+
 #include "language.h"
 
 class language_filet;
diff --git a/src/langapi/language_ui.cpp b/src/langapi/language_ui.cpp
@@ -13,11 +13,11 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #include <iostream>
 
 #include <util/namespace.h>
-#include <util/language.h>
 #include <util/cmdline.h>
 #include <util/config.h>
 #include <util/unicode.h>
 
+#include "language.h"
 #include "mode.h"
 
 /// Constructor
diff --git a/src/langapi/language_ui.h b/src/langapi/language_ui.h
@@ -11,10 +11,11 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #define CPROVER_LANGAPI_LANGUAGE_UI_H
 
 #include <util/message.h>
-#include <util/language_file.h>
 #include <util/symbol_table.h>
 #include <util/ui_message.h>
 
+#include "language_file.h"
+
 class cmdlinet;
 
 class language_uit:public messaget
diff --git a/src/langapi/language_util.cpp b/src/langapi/language_util.cpp
@@ -12,9 +12,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 
 #include <util/symbol_table.h>
 #include <util/namespace.h>
-#include <util/language.h>
 #include <util/std_expr.h>
 
+#include "language.h"
 #include "mode.h"
 
 static std::unique_ptr<languaget> get_language(
diff --git a/src/langapi/mode.cpp b/src/langapi/mode.cpp
@@ -16,7 +16,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #include <cstring>
 #endif
 
-#include <util/language.h>
+#include "language.h"
 
 struct language_entryt
 {
diff --git a/src/util/Makefile b/src/util/Makefile
@@ -35,8 +35,6 @@ SRC = arith_tools.cpp \
       json.cpp \
       json_expr.cpp \
       json_irep.cpp \
-      language.cpp \
-      language_file.cpp \
       lispexpr.cpp \
       lispirep.cpp \
       memory_info.cpp \
diff --git a/src/util/json_expr.cpp b/src/util/json_expr.cpp
@@ -20,10 +20,10 @@ Author: Peter Schrammel
 #include "std_expr.h"
 #include "config.h"
 #include "identifier.h"
-#include "language.h"
 #include "invariant.h"
 
 #include <langapi/mode.h>
+#include <langapi/language.h>
 
 #include <memory>
 
diff --git a/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp b/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp
@@ -12,9 +12,10 @@
 #include <memory>
 
 #include <util/config.h>
-#include <util/language.h>
 #include <util/message.h>
+
 #include <java_bytecode/java_bytecode_language.h>
+
 #include <testing-utils/load_java_class.h>
 
 SCENARIO("java_bytecode_convert_abstract_class",
diff --git a/unit/testing-utils/load_java_class.cpp b/unit/testing-utils/load_java_class.cpp
@@ -11,7 +11,6 @@
 #include <iostream>
 
 #include <util/config.h>
-#include <util/language.h>
 #include <util/options.h>
 #include <util/suffix.h>
 
diff --git a/unit/testing-utils/load_java_class.h b/unit/testing-utils/load_java_class.h
