Skip to content

Remove the string-non-empty function which had no effect #1729

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.

Sign up for GitHub

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 2 commits into from
Jan 14, 2018
Merged

Remove the string-non-empty function which had no effect #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9810f92
Drop string_non_empty field for string refinement
romainbrenguier Jan 12, 2018
5a8eea5
Remove the string-non-empty option
romainbrenguier Jan 12, 2018
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
2 changes: 0 additions & 2 deletions src/cbmc/cbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
if(cmdline.isset("refine-strings"))
{
options.set_option("refine-strings", true);
options.set_option("string-non-empty", cmdline.isset("string-non-empty"));
options.set_option("string-printable", cmdline.isset("string-printable"));
if(cmdline.isset("string-max-length"))
options.set_option(
Expand Down Expand Up @@ -1009,7 +1008,6 @@ void cbmc_parse_optionst::help()
" --z3 use Z3\n"
" --refine use refinement procedure (experimental)\n"
" --refine-strings use string refinement (experimental)\n"
" --string-non-empty add constraint that strings are non empty (experimental)\n" // NOLINT(*)
" --string-printable add constraint that strings are printable (experimental)\n" // NOLINT(*)
" --string-max-length add constraint on the length of strings\n" // NOLINT(*)
" --string-max-input-length add constraint on the length of input strings\n" // NOLINT(*)
Expand Down
1 change: 0 additions & 1 deletion src/cbmc/cbmc_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class optionst;
"(no-pretty-names)(beautify)" \
"(dimacs)(refine)(max-node-refinement):(refine-arrays)(refine-arithmetic)"\
"(refine-strings)" \
"(string-non-empty)" \
"(string-printable)" \
"(string-max-length):" \
"(string-max-input-length):" \
Expand Down
1 change: 0 additions & 1 deletion src/cbmc/cbmc_solvers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_string_refinement()
info.ui=ui;
if(options.get_bool_option("string-max-length"))
info.string_max_length=options.get_signed_int_option("string-max-length");
info.string_non_empty=options.get_bool_option("string-non-empty");
info.trace=options.get_bool_option("trace");
if(options.get_bool_option("max-node-refinement"))
info.max_node_refinement=
Expand Down
2 changes: 0 additions & 2 deletions src/jbmc/jbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ void jbmc_parse_optionst::get_command_line_options(optionst &options)
if(cmdline.isset("refine-strings"))
{
options.set_option("refine-strings", true);
options.set_option("string-non-empty", cmdline.isset("string-non-empty"));
options.set_option("string-printable", cmdline.isset("string-printable"));
if(cmdline.isset("string-max-length"))
options.set_option(
Expand Down Expand Up @@ -910,7 +909,6 @@ void jbmc_parse_optionst::help()
" --z3 use Z3\n"
" --refine use refinement procedure (experimental)\n"
" --refine-strings use string refinement (experimental)\n"
" --string-non-empty add constraint that strings are non empty (experimental)\n" // NOLINT(*)
" --string-printable add constraint that strings are printable (experimental)\n" // NOLINT(*)
" --string-max-length add constraint on the length of strings\n" // NOLINT(*)
" --string-max-input-length add constraint on the length of input strings\n" // NOLINT(*)
Expand Down
1 change: 0 additions & 1 deletion src/jbmc/jbmc_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class optionst;
"(no-pretty-names)(beautify)" \
"(dimacs)(refine)(max-node-refinement):(refine-arrays)(refine-arithmetic)"\
"(refine-strings)" \
"(string-non-empty)" \
"(string-printable)" \
"(string-max-length):" \
"(string-max-input-length):" \
Expand Down
2 changes: 0 additions & 2 deletions src/solvers/refinement/string_refinement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ class string_refinementt final: public bv_refinementt
struct configt
{
std::size_t refinement_bound=0;
/// Make non-deterministic character arrays have at least one character
bool string_non_empty=false;
/// Concretize strings after solver is finished
bool trace=false;
bool use_counter_example=true;
Expand Down