Link JSON symbol tables

Instead of trying to merge them and throwing exception for every symbol
conflict.

Author: petr-bauch

src/json-symtab-language/json_symtab_language.cpp

@@ -13,6 +13,8 @@ Author: Chris Smowton, [email protected]
 #include <json/json_parser.h>
 #include <util/namespace.h>
 
+#include <linking/linking.h>
+
 /// Parse a goto program in json form.
 /// \param instream: The input stream
 /// \param path: A file path
@@ -34,10 +36,12 @@ bool json_symtab_languaget::typecheck(
 {
   (void)module; // unused parameter
 
+  symbol_tablet new_symbol_table;
+
   try
   {
-    symbol_table_from_json(parsed_json_file, symbol_table);
-    return false;
+    symbol_table_from_json(parsed_json_file, new_symbol_table);
+    return linking(symbol_table, new_symbol_table, get_message_handler());
   }
   catch(const std::string &str)
   {

src/json-symtab-language/module_dependencies.txt

@@ -1,4 +1,5 @@
 goto-programs
 json
 langapi
+linking
 util