Move the handling of C/C++ standard versions into configt

Although configt is not an ideal solution, I think it is best for it to do
all of the parsing for its option in one place.  As a side effect this adds
the C and C++ language options to goto-analyzer.

Author: martin

src/cbmc/cbmc_parse_options.cpp

@@ -203,9 +203,6 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
   if(cmdline.isset("mm"))
     options.set_option("mm", cmdline.get_value("mm"));
 
-  if(cmdline.isset("c89"))
-    config.ansi_c.set_c89();
-
   if(cmdline.isset("symex-complexity-limit"))
     options.set_option(
       "symex-complexity-limit", cmdline.get_value("symex-complexity-limit"));
@@ -215,21 +212,6 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
       "symex-complexity-failed-child-loops-limit",
       cmdline.get_value("symex-complexity-failed-child-loops-limit"));
 
-  if(cmdline.isset("c99"))
-    config.ansi_c.set_c99();
-
-  if(cmdline.isset("c11"))
-    config.ansi_c.set_c11();
-
-  if(cmdline.isset("cpp98"))
-    config.cpp.set_cpp98();
-
-  if(cmdline.isset("cpp03"))
-    config.cpp.set_cpp03();
-
-  if(cmdline.isset("cpp11"))
-    config.cpp.set_cpp11();
-
   if(cmdline.isset("property"))
     options.set_option("property", cmdline.get_values("property"));
 

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -101,26 +101,6 @@ void goto_analyzer_parse_optionst::get_command_line_options(optionst &options)
   if(cmdline.isset("function"))
     options.set_option("function", cmdline.get_value("function"));
 
-#if 0
-  if(cmdline.isset("c89"))
-    config.ansi_c.set_c89();
-
-  if(cmdline.isset("c99"))
-    config.ansi_c.set_c99();
-
-  if(cmdline.isset("c11"))
-    config.ansi_c.set_c11();
-
-  if(cmdline.isset("cpp98"))
-    config.cpp.set_cpp98();
-
-  if(cmdline.isset("cpp03"))
-    config.cpp.set_cpp03();
-
-  if(cmdline.isset("cpp11"))
-    config.cpp.set_cpp11();
-#endif
-
   // all checks supported by goto_check
   PARSE_OPTIONS_GOTO_CHECK(cmdline, options);
 

src/goto-diff/goto_diff_parse_options.cpp

@@ -97,24 +97,6 @@ void goto_diff_parse_optionst::get_command_line_options(optionst &options)
   if(cmdline.isset("mm"))
     options.set_option("mm", cmdline.get_value("mm"));
 
-  if(cmdline.isset("c89"))
-    config.ansi_c.set_c89();
-
-  if(cmdline.isset("c99"))
-    config.ansi_c.set_c99();
-
-  if(cmdline.isset("c11"))
-    config.ansi_c.set_c11();
-
-  if(cmdline.isset("cpp98"))
-    config.cpp.set_cpp98();
-
-  if(cmdline.isset("cpp03"))
-    config.cpp.set_cpp03();
-
-  if(cmdline.isset("cpp11"))
-    config.cpp.set_cpp11();
-
   // all checks supported by goto_check
   PARSE_OPTIONS_GOTO_CHECK(cmdline, options);
 

src/util/config.cpp

@@ -1127,6 +1127,24 @@ bool configt::set(const cmdlinet &cmdline)
 
   ansi_c.malloc_may_fail = cmdline.isset("malloc-may-fail");
 
+  if(cmdline.isset("c89"))
+    ansi_c.set_c89();
+
+  if(cmdline.isset("c99"))
+    ansi_c.set_c99();
+
+  if(cmdline.isset("c11"))
+    ansi_c.set_c11();
+
+  if(cmdline.isset("cpp98"))
+    cpp.set_cpp98();
+
+  if(cmdline.isset("cpp03"))
+    cpp.set_cpp03();
+
+  if(cmdline.isset("cpp11"))
+    cpp.set_cpp11();
+
   return false;
 }