Call get_language_options from get_goto_model

Author: smowton

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -215,7 +215,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))

src/goto-programs/get_goto_model.cpp

@@ -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;
@@ -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;
 

src/goto-programs/get_goto_model.h

@@ -10,14 +10,15 @@ 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:
   get_goto_modelt() : generate_start_function(true) {}
-  bool operator()(const std::vector<std::string> &);
+  bool operator()(const cmdlinet &);
   bool generate_start_function;
 };
 

src/symex/symex_parse_options.cpp

@@ -177,7 +177,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))