Skip to content

Call get_language_options from get_goto_model #588

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
Apr 4, 2017
Merged

Call get_language_options from get_goto_model #588

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
2 changes: 1 addition & 1 deletion 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 @@ -216,7 +216,7 @@ int goto_analyzer_parse_optionst::doit()

goto_model.set_message_handler(get_message_handler());

if(goto_model(cmdline.args))
if(goto_model(cmdline))
return 6;

if(process_goto_program(options))
Expand Down
4 changes: 3 additions & 1 deletion src/goto-programs/get_goto_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ Function: get_goto_modelt::operator()

\*******************************************************************/

bool get_goto_modelt::operator()(const std::vector<std::string> &files)
bool get_goto_modelt::operator()(const cmdlinet &_cmdline)
{
const std::vector<std::string> &files=_cmdline.args;
if(files.empty())
{
error() << "Please provide a program" << eom;
Expand Down Expand Up @@ -92,6 +93,7 @@ bool get_goto_modelt::operator()(const std::vector<std::string> &files)

languaget &language=*lf.language;
language.set_message_handler(get_message_handler());
language.get_language_options(_cmdline);

status() << "Parsing " << filename << eom;

Expand Down
3 changes: 2 additions & 1 deletion src/goto-programs/get_goto_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ Author: Daniel Kroening, [email protected]
#define CPROVER_GOTO_PROGRAMS_GET_GOTO_MODEL_H

#include <util/message.h>
#include <util/cmdline.h>

#include "goto_model.h"

class get_goto_modelt:public goto_modelt, public messaget
{
public:
bool operator()(const std::vector<std::string> &);
bool operator()(const cmdlinet &);
};

#endif // CPROVER_GOTO_PROGRAMS_GET_GOTO_MODEL_H
2 changes: 1 addition & 1 deletion src/symex/symex_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ int symex_parse_optionst::doit()

goto_model.set_message_handler(get_message_handler());

if(goto_model(cmdline.args))
if(goto_model(cmdline))
return 6;

if(process_goto_program(options))
Expand Down