A consistent set of front-ends across all general purpose tools

This is using CBMC as the base line and adding support to other tools.
Note that some special purpose tools (memory-analyzer, goto-harness,
symtab2gb and goto-cc) are excluded from this as it doesn't make sense
to support all of the front-ends for them.

Author: martin

src/goto-analyzer/Makefile

@@ -21,8 +21,10 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../pointer-analysis/pointer-analysis$(LIBEXT) \
       ../langapi/langapi$(LIBEXT) \
       ../json/json$(LIBEXT) \
+      ../json-symtab-language/json-symtab-language$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \
       ../solvers/solvers$(LIBEXT) \
+      ../statement-list/statement-list$(LIBEXT) \
       ../util/util$(LIBEXT) \
       # Empty last line
 

src/goto-analyzer/goto_analyzer_languages.cpp

@@ -15,6 +15,8 @@ Author: Martin Brain, [email protected]
 
 #include <ansi-c/ansi_c_language.h>
 #include <cpp/cpp_language.h>
+#include <json-symtab-language/json_symtab_language.h>
+#include <statement-list/statement_list_language.h>
 
 #ifdef HAVE_JSIL
 #  include <jsil/jsil_language.h>
@@ -23,7 +25,9 @@ Author: Martin Brain, [email protected]
 void goto_analyzer_parse_optionst::register_languages()
 {
   register_language(new_ansi_c_language);
+  register_language(new_statement_list_language);
   register_language(new_cpp_language);
+  register_language(new_json_symtab_language);
 
 #ifdef HAVE_JSIL
   register_language(new_jsil_language);

src/goto-analyzer/module_dependencies.txt

@@ -9,4 +9,6 @@ java_bytecode # will go away
 langapi # should go away
 jsil
 json
+json-symtab-language
+statement-list
 util

src/goto-diff/Makefile

@@ -30,7 +30,9 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../xmllang/xmllang$(LIBEXT) \
       ../util/util$(LIBEXT) \
       ../solvers/solvers$(LIBEXT) \
+      ../statement-list/statement-list$(LIBEXT) \
       ../json/json$(LIBEXT) \
+      ../json-symtab-language/json-symtab-language$(LIBEXT) \
       # Empty last line
 
 INCLUDES= -I ..

src/goto-diff/goto_diff_languages.cpp

@@ -15,9 +15,21 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/ansi_c_language.h>
 #include <cpp/cpp_language.h>
+#include <json-symtab-language/json_symtab_language.h>
+#include <statement-list/statement_list_language.h>
+
+#ifdef HAVE_JSIL
+#  include <jsil/jsil_language.h>
+#endif
 
 void goto_diff_parse_optionst::register_languages()
 {
   register_language(new_ansi_c_language);
+  register_language(new_statement_list_language);
   register_language(new_cpp_language);
+  register_language(new_json_symtab_language);
+
+#ifdef HAVE_JSIL
+  register_language(new_jsil_language);
+#endif
 }

src/goto-diff/module_dependencies.txt

@@ -6,6 +6,9 @@ goto-diff
 goto-instrument
 goto-programs
 java_bytecode # will go away
+jsil
+json-symtab-language
 langapi # should go away
 pointer-analysis
+statement-list
 util

src/goto-instrument/Makefile

@@ -93,7 +93,9 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../xmllang/xmllang$(LIBEXT) \
       ../util/util$(LIBEXT) \
       ../solvers/solvers$(LIBEXT) \
+      ../statement-list/statement-list$(LIBEXT) \
       ../json/json$(LIBEXT) \
+      ../json-symtab-language/json-symtab-language$(LIBEXT) \
       # Empty last line
 
 INCLUDES= -I ..

src/goto-instrument/goto_instrument_languages.cpp

@@ -15,9 +15,21 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/ansi_c_language.h>
 #include <cpp/cpp_language.h>
+#include <json-symtab-language/json_symtab_language.h>
+#include <statement-list/statement_list_language.h>
+
+#ifdef HAVE_JSIL
+#  include <jsil/jsil_language.h>
+#endif
 
 void goto_instrument_parse_optionst::register_languages()
 {
   register_language(new_ansi_c_language);
+  register_language(new_statement_list_language);
   register_language(new_cpp_language);
+  register_language(new_json_symtab_language);
+
+#ifdef HAVE_JSIL
+  register_language(new_jsil_language);
+#endif
 }

src/goto-instrument/module_dependencies.txt

@@ -5,8 +5,11 @@ assembler
 cpp
 goto-instrument
 goto-programs
+jsil
+json-symtab-language
 langapi # should go away
 linking
 pointer-analysis
+statement-list
 util
 wmm