Eh, what?

1 files changed, 18 insertions, 18 deletions

diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index 02bfc6ca0..fc8b31d49 100644
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -3,7 +3,7 @@
  ** \verbatim
  ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): none
+ ** Minor contributors (to current version): Kshitij Bansal
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
@@ -47,13 +47,14 @@ extern int optreset;
 
 #include "expr/expr.h"
 #include "util/configuration.h"
+#include "util/didyoumean.h"
 #include "util/exception.h"
 #include "util/language.h"
 #include "util/tls.h"
 
 ${include_all_option_headers}
 
-#line 57 "${template}"
+#line 58 "${template}"
 
 #include "util/output.h"
 #include "options/options_holder.h"
@@ -62,7 +63,7 @@ ${include_all_option_headers}
 
 ${option_handler_includes}
 
-#line 66 "${template}"
+#line 67 "${template}"
 
 using namespace CVC4;
 using namespace CVC4::options;
@@ -199,7 +200,7 @@ void runBoolPredicates(T, std::string option, bool b, SmtEngine* smt) {
 
 ${all_custom_handlers}
 
-#line 203 "${template}"
+#line 204 "${template}"
 
 #ifdef CVC4_DEBUG
 #  define USE_EARLY_TYPE_CHECKING_BY_DEFAULT true
@@ -229,18 +230,18 @@ options::OptionsHolder::OptionsHolder() : ${all_modules_defaults}
 {
 }
 
-#line 233 "${template}"
+#line 234 "${template}"
 
 static const std::string mostCommonOptionsDescription = "\
 Most commonly-used CVC4 options:${common_documentation}";
 
-#line 238 "${template}"
+#line 239 "${template}"
 
 static const std::string optionsDescription = mostCommonOptionsDescription + "\n\
 \n\
 Additional CVC4 options:${remaining_documentation}";
 
-#line 244 "${template}"
+#line 245 "${template}"
 
 static const std::string optionsFootnote = "\n\
 [*] Each of these options has a --no-OPTIONNAME variant, which reverses the\n\
@@ -312,7 +313,7 @@ static struct option cmdlineOptions[] = {${all_modules_long_options}
   { NULL, no_argument, NULL, '\0' }
 };/* cmdlineOptions */
 
-#line 316 "${template}"
+#line 317 "${template}"
 
 static void preemptGetopt(int& argc, char**& argv, const char* opt) {
   const size_t maxoptlen = 128;
@@ -505,7 +506,7 @@ std::vector<std::string> Options::parseOptions(int argc, char* main_argv[]) thro
     switch(c) {
 ${all_modules_option_handlers}
 
-#line 509 "${template}"
+#line 510 "${template}"
 
     case ':':
       // This can be a long or short option, and the way to get at the
@@ -549,7 +550,8 @@ ${all_modules_option_handlers}
         break;
       }
 
-      throw OptionException(std::string("can't understand option `") + option + "'");
+      throw OptionException(std::string("can't understand option `") + option + "'"
+                            + suggestCommandLineOptions(option));
     }
   }
 
@@ -558,22 +560,20 @@ ${all_modules_option_handlers}
   return nonOptions;
 }
 
-std::vector<std::string> Options::suggestCommandLineOptions(const std::string& optionName) throw() {
-  std::vector<std::string> suggestions;
+std::string Options::suggestCommandLineOptions(const std::string& optionName) throw() {
+  DidYouMean didYouMean;
 
   const char* opt;
   for(size_t i = 0; (opt = cmdlineOptions[i].name) != NULL; ++i) {
-    if(std::strstr(opt, optionName.c_str()) != NULL) {
-      suggestions.push_back(opt);
-    }
+    didYouMean.addWord(std::string("--") + cmdlineOptions[i].name);
   }
 
-  return suggestions;
+  return didYouMean.getMatchAsString(optionName);
 }
 
 static const char* smtOptions[] = {
   ${all_modules_smt_options},
-#line 577 "${template}"
+#line 589 "${template}"
   NULL
 };/* smtOptions[] */
 
@@ -595,7 +595,7 @@ SExpr Options::getOptions() const throw() {
 
   ${all_modules_get_options}
 
-#line 599 "${template}"
+#line 611 "${template}"
 
   return SExpr(opts);
 }