Explicitly mark some options as legacy and suggest modern versions

Author: martin

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -160,13 +160,16 @@ void goto_analyzer_parse_optionst::get_command_line_options(optionst &options)
       "simplify-slicing",
       !(cmdline.isset("no-simplify-slicing")));
   }
+  // Legacy options
   else if(cmdline.isset("show-intervals"))
   {
     // For backwards compatibility
     options.set_option("show", true);
     options.set_option("general-analysis", true);
     options.set_option("intervals", true);
     options.set_option("domain set", true);
+    log.status() << "--show-intervals is deprecated,"
+                 << "please use --show --intervals" << messaget::eom;
   }
   else if(cmdline.isset("show-non-null"))
   {
@@ -175,6 +178,8 @@ void goto_analyzer_parse_optionst::get_command_line_options(optionst &options)
     options.set_option("general-analysis", true);
     options.set_option("non-null", true);
     options.set_option("domain set", true);
+    log.status() << "--show-non-null is deprecated,"
+                 << "please use --show --non-null" << messaget::eom;
   }
   else if(cmdline.isset("intervals") || cmdline.isset("non-null"))
   {

src/goto-analyzer/goto_analyzer_parse_options.h

@@ -144,6 +144,9 @@ class optionst;
   "(taint):(show-taint)" \
   "(show-local-may-alias)"
 
+#define GOTO_ANALYZER_OPTIONS_LEGACY \
+  "(show-intervals)(show-non-null)" \
+
 #define GOTO_ANALYSER_OPTIONS \
   OPT_FUNCTIONS \
   OPT_CONFIG_C_CPP \
@@ -159,7 +162,6 @@ class optionst;
   OPT_VALIDATE \
   GOTO_ANALYSER_OPTIONS_TASKS \
   "(no-simplify-slicing)" \
-  "(show-intervals)(show-non-null)" \
   GOTO_ANALYSER_OPTIONS_AI \
   "(location-sensitive)(concurrent)" \
   GOTO_ANALYSER_OPTIONS_HISTORY \
@@ -168,6 +170,7 @@ class optionst;
   GOTO_ANALYSER_OPTIONS_STORAGE  \
   GOTO_ANALYSER_OPTIONS_OUTPUT \
   GOTO_ANALYSER_OPTIONS_SPECIFIC_ANALYSES \
+  GOTO_ANALYZER_OPTIONS_LEGACY \
 // clang-format on
 
 class goto_analyzer_parse_optionst: public parse_options_baset