Skip to content

Remove JSIL front-end #8158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ src/ansi-c/ansi_c_y.tab.cpp
src/ansi-c/ansi_c_y.tab.h
src/assembler/assembler_lex.yy.cpp
src/crangler/c_lex.yy.cpp
src/jsil/jsil_lex.yy.cpp
src/jsil/jsil_y.output
src/jsil/jsil_y.tab.cpp
src/jsil/jsil_y.tab.h
src/json/json_lex.yy.cpp
src/json/json_y.output
src/json/json_y.tab.cpp
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ cprover_default_properties(
goto-symex
goto-synthesizer
goto-synthesizer-lib
jsil
json
json-symtab-language
langapi
Expand Down
1 change: 0 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
/src/goto-inspect/ @diffblue/diffblue-opensource
/src/goto-synthesizer/ @qinheping @tautschnig @feliperodri @remi-delmas-3000
/src/goto-diff/ @tautschnig @peterschrammel
/src/jsil/ @kroening @tautschnig
/src/memory-analyzer/ @tautschnig @kroening
/jbmc/src/jbmc/ @peterschrammel @TGWDB
/jbmc/src/janalyzer/ @peterschrammel @TGWDB
Expand Down
9 changes: 3 additions & 6 deletions doc/architectural/folder-walkthrough.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ containing the code for a different part of the system.
* C: \ref ansi-c
* C++: \ref cpp
* Java: \ref java_bytecode
* JavaScript: \ref jsil

- Tools

Expand Down Expand Up @@ -155,7 +154,6 @@ digraph directory_dependencies {
ansi_c [label = "ansi-c", URL = "\ref ansi-c"];
langapi [URL = "\ref langapi"];
cpp [URL = "\ref cpp"];
jsil [URL = "\ref jsil"];
java_bytecode [URL = "\ref java_bytecode"];
}

Expand All @@ -174,15 +172,14 @@ digraph directory_dependencies {
JBMC -> { CBMC, java_bytecode };
jdiff -> { goto_diff, java_bytecode };
janalyzer -> { goto_analyzer, java_bytecode };
CBMC -> { goto_instrument, jsil };
CBMC -> { goto_instrument };
goto_diff -> { goto_instrument };
goto_analyzer -> { analyses, jsil, cpp };
goto_analyzer -> { analyses, cpp };
goto_instrument -> { goto_symex, cpp };
goto_cc -> { cpp, jsil };
goto_cc -> { cpp };
smt2_solver -> solvers;

java_bytecode -> { analyses, miniz };
jsil -> linking;
cpp -> ansi_c;
ansi_c -> langapi;
langapi -> goto_programs;
Expand Down
5 changes: 0 additions & 5 deletions jbmc/src/janalyzer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ CLEANFILES = janalyzer$(EXEEXT)

all: janalyzer$(EXEEXT)

ifneq ($(wildcard ../jsil/Makefile),)
OBJ += ../jsil/jsil$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JSIL
endif

###############################################################################

janalyzer$(EXEEXT): $(OBJ)
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ add_subdirectory(goto-checker)
add_subdirectory(goto-programs)
add_subdirectory(goto-symex)
add_subdirectory(goto-inspect)
add_subdirectory(jsil)
add_subdirectory(json)
add_subdirectory(json-symtab-language)
add_subdirectory(langapi)
Expand Down
3 changes: 1 addition & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ DIRS = analyses \
goto-programs \
goto-symex \
goto-synthesizer \
jsil \
json \
json-symtab-language \
langapi \
Expand Down Expand Up @@ -82,7 +81,7 @@ crangler.dir: util.dir json.dir

languages: util.dir langapi.dir \
cpp.dir ansi-c.dir xmllang.dir assembler.dir \
jsil.dir json.dir json-symtab-language.dir statement-list.dir
json.dir json-symtab-language.dir statement-list.dir

solvers.dir: util.dir

Expand Down
1 change: 0 additions & 1 deletion src/cbmc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ target_link_libraries(cbmc-lib
)

add_if_library(cbmc-lib bv_refinement)
add_if_library(cbmc-lib jsil)

# Executable
add_executable(cbmc cbmc_main.cpp)
Expand Down
5 changes: 0 additions & 5 deletions src/cbmc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ ifneq ($(wildcard ../bv_refinement/Makefile),)
CP_CXXFLAGS += -DHAVE_BV_REFINEMENT
endif

ifneq ($(wildcard ../jsil/Makefile),)
OBJ += ../jsil/jsil$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JSIL
endif

###############################################################################

cbmc$(EXEEXT): $(OBJ)
Expand Down
8 changes: 0 additions & 8 deletions src/cbmc/cbmc_languages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,10 @@ Author: Daniel Kroening, [email protected]
#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 cbmc_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
}
1 change: 0 additions & 1 deletion src/cbmc/module_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ goto-checker
goto-instrument
goto-programs
goto-symex
jsil
json
json-symtab-language
langapi # should go away
Expand Down
1 change: 0 additions & 1 deletion src/cprover/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ target_link_libraries(cprover-lib
)

add_if_library(cprover-lib bv_refinement)
add_if_library(cprover-lib jsil)

# Executable
add_executable(cprover cprover_main.cpp)
Expand Down
2 changes: 0 additions & 2 deletions src/goto-analyzer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ target_link_libraries(goto-analyzer-lib
util
)

add_if_library(goto-analyzer-lib jsil)

# Executable
add_executable(goto-analyzer goto_analyzer_main.cpp)
target_link_libraries(goto-analyzer goto-analyzer-lib)
Expand Down
5 changes: 0 additions & 5 deletions src/goto-analyzer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ CLEANFILES = goto-analyzer$(EXEEXT)

all: goto-analyzer$(EXEEXT)

ifneq ($(wildcard ../jsil/Makefile),)
OBJ += ../jsil/jsil$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JSIL
endif

###############################################################################

goto-analyzer$(EXEEXT): $(OBJ)
Expand Down
8 changes: 0 additions & 8 deletions src/goto-analyzer/goto_analyzer_languages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,8 @@ Author: Martin Brain, [email protected]
#include <ansi-c/ansi_c_language.h>
#include <cpp/cpp_language.h>

#ifdef HAVE_JSIL
# include <jsil/jsil_language.h>
#endif

void goto_analyzer_parse_optionst::register_languages()
{
register_language(new_ansi_c_language);
register_language(new_cpp_language);

#ifdef HAVE_JSIL
register_language(new_jsil_language);
#endif
}
1 change: 0 additions & 1 deletion src/goto-analyzer/module_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ goto-checker
goto-programs
java_bytecode # will go away
langapi # should go away
jsil
json
util
2 changes: 0 additions & 2 deletions src/goto-cc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ target_link_libraries(goto-cc-lib
langapi
)

add_if_library(goto-cc-lib jsil)

# Executable
add_executable(goto-cc goto_cc_main.cpp)
target_link_libraries(goto-cc goto-cc-lib)
Expand Down
5 changes: 0 additions & 5 deletions src/goto-cc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ else
all: goto-gcc$(EXEEXT)
endif

ifneq ($(wildcard ../jsil/Makefile),)
OBJ += ../jsil/jsil$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JSIL
endif

###############################################################################

goto-gcc$(EXEEXT): goto-cc$(EXEEXT)
Expand Down
2 changes: 1 addition & 1 deletion src/goto-cc/compile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static file_typet detect_file_type(
if(
ext == "c" || ext == "cc" || ext == "cp" || ext == "cpp" || ext == "CPP" ||
ext == "c++" || ext == "C" || ext == "i" || ext == "ii" || ext == "class" ||
ext == "jar" || ext == "jsil")
ext == "jar")
{
return file_typet::SOURCE_FILE;
}
Expand Down
8 changes: 0 additions & 8 deletions src/goto-cc/goto_cc_languages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,8 @@ Author: CM Wintersteiger
#include <ansi-c/ansi_c_language.h>
#include <cpp/cpp_language.h>

#ifdef HAVE_JSIL
# include <jsil/jsil_language.h>
#endif

void goto_cc_modet::register_languages()
{
register_language(new_ansi_c_language);
register_language(new_cpp_language);

#ifdef HAVE_JSIL
register_language(new_jsil_language);
#endif
}
1 change: 0 additions & 1 deletion src/goto-cc/module_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ansi-c
cpp
goto-cc
goto-programs
jsil
json
langapi # should go away
linking
Expand Down
2 changes: 0 additions & 2 deletions src/goto-diff/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ target_link_libraries(goto-diff-lib
solvers
)

add_if_library(goto-diff-lib jsil)

# Executable
add_executable(goto-diff goto_diff_main.cpp)
target_link_libraries(goto-diff goto-diff-lib)
Expand Down
1 change: 0 additions & 1 deletion src/goto-programs/goto_convert_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ void goto_convert_functionst::goto_convert(goto_functionst &functions)
symbol_pair.second.type.id() == ID_code &&
(symbol_pair.second.mode == ID_C || symbol_pair.second.mode == ID_cpp ||
symbol_pair.second.mode == ID_java ||
symbol_pair.second.mode == "jsil" ||
symbol_pair.second.mode == ID_statement_list))
{
symbol_list.push_back(symbol_pair.first);
Expand Down
13 changes: 0 additions & 13 deletions src/jsil/CMakeLists.txt

This file was deleted.

42 changes: 0 additions & 42 deletions src/jsil/Makefile

This file was deleted.

6 changes: 0 additions & 6 deletions src/jsil/README.md

This file was deleted.

35 changes: 0 additions & 35 deletions src/jsil/expr2jsil.cpp

This file was deleted.

24 changes: 0 additions & 24 deletions src/jsil/expr2jsil.h

This file was deleted.

Loading