Moved json_symbol and json_symbol_table to a different folder.

Move json_symbol and json_symbol_table from util to json-symtab-language
subfolder, and add missing files to the Makefile.

Author: NlightNFotis

jbmc/unit/CMakeLists.txt

@@ -26,6 +26,7 @@ target_link_libraries(java-unit
         goto-programs
         goto-instrument-lib
         cbmc-lib
+        json-symtab-language
 )
 
 add_test(

jbmc/unit/Makefile

@@ -108,6 +108,7 @@ CPROVER_LIBS =../src/java_bytecode/java_bytecode$(LIBEXT) \
               $(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \
               $(CPROVER_DIR)/src/cpp/cpp$(LIBEXT) \
               $(CPROVER_DIR)/src/json/json$(LIBEXT) \
+              $(CPROVER_DIR)/src/json-symtab-language/json-symtab-language$(LIBEXT) \
               $(CPROVER_DIR)/src/linking/linking$(LIBEXT) \
               $(CPROVER_DIR)/src/util/util$(LIBEXT) \
               $(CPROVER_DIR)/src/big-int/big-int$(LIBEXT) \

src/cbmc/Makefile

@@ -15,7 +15,7 @@ SRC = all_properties.cpp \
 OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../cpp/cpp$(LIBEXT) \
       ../json/json$(LIBEXT) \
-      ../json-symtab-language/json_symtab_language$(LIBEXT) \
+      ../json-symtab-language/json-symtab-language$(LIBEXT) \
       ../linking/linking$(LIBEXT) \
       ../big-int/big-int$(LIBEXT) \
       ../goto-programs/goto-programs$(LIBEXT) \

src/json-symtab-language/CMakeLists.txt

@@ -3,4 +3,4 @@ add_library(json-symtab-language ${sources})
 
 generic_includes(json-symtab-language)
 
-#target_link_libraries(json-symtab-language util)
+target_link_libraries(json-symtab-language json util)

src/json-symtab-language/Makefile

@@ -1,15 +1,17 @@
-SRC = json_symtab_language.cpp
+SRC = json_symtab_language.cpp \
+	json_symbol_table.cpp \
+	json_symbol.cpp 
 
 INCLUDES= -I ..
 
 include ../config.inc
 include ../common
 
-CLEANFILES = json_symtab_language$(LIBEXT)
+CLEANFILES = json-symtab-language$(LIBEXT)
 
-all: json_symtab_language$(LIBEXT)
+all: json-symtab-language$(LIBEXT)
 
 ###############################################################################
 
-json_symtab_language$(LIBEXT): $(OBJ)
+json-symtab-language$(LIBEXT): $(OBJ)
 	$(LINKLIB)

src/util/json_symbol.cpp renamed to src/json-symtab-language/json_symbol.cpp

@@ -9,8 +9,8 @@ Author: Chris Smowton, [email protected]
 #ifndef CPROVER_JSON_SYMTAB_LANGUAGE_JSON_SYMBOL_H
 #define CPROVER_JSON_SYMTAB_LANGUAGE_JSON_SYMBOL_H
 
-#include "json.h"
-#include "symbol.h"
+#include <util/json.h>
+#include <util/symbol.h>
 
 symbolt symbol_from_json(const jsont &);
 

src/util/json_symbol.h renamed to src/json-symtab-language/json_symbol.h

@@ -9,8 +9,8 @@ Author: Chris Smowton, [email protected]
 \*******************************************************************/
 
 #include "json_symtab_language.h"
+#include "json_symbol_table.h"
 #include <json/json_parser.h>
-#include <util/json_symbol_table.h>
 #include <util/namespace.h>
 
 /// Parse a goto program in json form.

src/util/json_symbol_table.cpp renamed to src/json-symtab-language/json_symbol_table.cpp

@@ -0,0 +1,4 @@
+goto-programs
+json
+langapi
+util

src/util/json_symbol_table.h renamed to src/json-symtab-language/json_symbol_table.h

@@ -37,6 +37,7 @@ target_link_libraries(
         goto-programs
         goto-instrument-lib
         cbmc-lib
+        json-symtab-language
 )
 
 add_test(

src/json-symtab-language/json_symtab_language.cpp

@@ -104,6 +104,7 @@ BMC_DEPS =../src/cbmc/all_properties$(OBJEXT) \
 CPROVER_LIBS =../src/ansi-c/ansi-c$(LIBEXT) \
               ../src/cpp/cpp$(LIBEXT) \
               ../src/json/json$(LIBEXT) \
+              ../src/json-symtab-language/json-symtab-language$(LIBEXT) \
               ../src/linking/linking$(LIBEXT) \
               ../src/util/util$(LIBEXT) \
               ../src/big-int/big-int$(LIBEXT) \