Skip to content

Fix location of show-symbol-table #1599

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 1 commit into from
Nov 17, 2017
Merged

Fix location of show-symbol-table #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 15 additions & 14 deletions src/clobber/clobber_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,21 @@ int clobber_parse_optionst::doit()
{
goto_model=initialize_goto_model(cmdline, get_message_handler());


// show it?
if(cmdline.isset("show-loops"))
{
show_loop_ids(get_ui(), goto_model);
return 6;
}

// show it?
if(cmdline.isset("show-goto-functions"))
{
show_goto_functions(goto_model, get_ui());
return 6;
}

label_properties(goto_model);

if(cmdline.isset("show-properties"))
Expand Down Expand Up @@ -211,20 +226,6 @@ bool clobber_parse_optionst::process_goto_program(

if(cmdline.isset("cover-assertions"))
make_assertions_false(goto_model);

// show it?
if(cmdline.isset("show-loops"))
{
show_loop_ids(get_ui(), goto_model);
return true;
}

// show it?
if(cmdline.isset("show-goto-functions"))
{
show_goto_functions(goto_model, get_ui());
return true;
}
}

return false;
Expand Down
28 changes: 14 additions & 14 deletions src/goto-analyzer/goto_analyzer_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,20 @@ int goto_analyzer_parse_optionst::doit()
if(process_goto_program(options))
return 6;

// show it?
if(cmdline.isset("show-symbol-table"))
{
::show_symbol_table(goto_model.symbol_table, get_ui());
return 6;
}

// show it?
if(cmdline.isset("show-goto-functions"))
{
show_goto_functions(goto_model, get_ui());
return 6;
}

if(cmdline.isset("taint"))
{
std::string taint_file=cmdline.get_value("taint");
Expand Down Expand Up @@ -400,20 +414,6 @@ bool goto_analyzer_parse_optionst::process_goto_program(

// add loop ids
goto_model.goto_functions.compute_loop_numbers();

// show it?
if(cmdline.isset("show-goto-functions"))
{
show_goto_functions(goto_model, get_ui());
return true;
}

// show it?
if(cmdline.isset("show-symbol-table"))
{
::show_symbol_table(goto_model, get_ui());
return true;
}
}

catch(const char *e)
Expand Down