Making RuntimeError a ParseError

CLIUtils · Nov 20, 2017 · d3c684a · d3c684a
1 parent 7b433ec
commit d3c684a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/examples/enum.cpp b/examples/enum.cpp
@@ -9,10 +9,7 @@ int main(int argc, char **argv) {
     app.add_set("-l,--level", level, {High, Medium, Low}, "Level settings")
         ->set_type_name("enum/Level in {High=0, Medium=1, Low=2}");
 
-    try {
-        app.parse(argc, argv);
-    } catch(CLI::Error const &e) {
-        app.exit(e);
-    }
+    CLI11_PARSE(app, argc, argv);
+
     return 0;
 }
diff --git a/examples/groups.cpp b/examples/groups.cpp
@@ -17,7 +17,7 @@ int main(int argc, char **argv) {
 
     try {
         app.parse(argc, argv);
-    } catch(const CLI::Error &e) {
+    } catch(const CLI::ParseError &e) {
         return app.exit(e);
     }
 

diff --git a/examples/inter_argument_order.cpp b/examples/inter_argument_order.cpp
@@ -15,10 +15,10 @@ int main(int argc, char **argv) {
 
     app.add_flag("--z,--x"); // Random other flags
 
-    // Standard parsing lines (copy and paste in)
+    // Standard parsing lines (copy and paste in, or use CLI11_PARSE)
     try {
         app.parse(argc, argv);
-    } catch(const CLI::Error &e) {
+    } catch(const CLI::ParseError &e) {
         return app.exit(e);
     }
 

diff --git a/examples/subcommands.cpp b/examples/subcommands.cpp
@@ -12,11 +12,7 @@ int main(int argc, char **argv) {
 
     CLI::Option *s = stop->add_flag("-c,--count", "Counter");
 
-    try {
-        app.parse(argc, argv);
-    } catch(const CLI::Error &e) {
-        return app.exit(e);
-    }
+    CLI11_PARSE(app, argc, argv);
 
     std::cout << "Working on file: " << file << ", direct count: " << start->count("--file") << std::endl;
     std::cout << "Working on count: " << s->count() << ", direct count: " << stop->count("--count") << std::endl;

diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
@@ -29,7 +29,7 @@ namespace CLI {
 #define CLI11_PARSE(app, argc, argv)                                                                                   \
     try {                                                                                                              \
         (app).parse((argc), (argv));                                                                                   \
-    } catch(const CLI::Error &e) {                                                                                     \
+    } catch(const CLI::ParseError &e) {                                                                                \
         return (app).exit(e);                                                                                          \
     }
 #endif

diff --git a/include/CLI/Error.hpp b/include/CLI/Error.hpp
@@ -79,13 +79,6 @@ struct OptionAlreadyAdded : public ConstructionError {
         : ConstructionError("OptionAlreadyAdded", name, ExitCodes::OptionAlreadyAdded) {}
 };
 
-// Runtime Errors
-
-/// Does not output a diagnostic in CLI11_PARSE, but allows to return from main() with a specific error code.
-struct RuntimeError : public Error {
-    RuntimeError(int exit_code = 1) : Error("RuntimeError", "runtime error", exit_code, false) {}
-};
-
 // Parsing errors
 
 /// Anything that can error in Parse
@@ -107,6 +100,11 @@ struct CallForHelp : public ParseError {
         : ParseError("CallForHelp", "This should be caught in your main function, see examples", ExitCodes::Success) {}
 };
 
+/// Does not output a diagnostic in CLI11_PARSE, but allows to return from main() with a specific error code.
+struct RuntimeError : public ParseError {
+    RuntimeError(int exit_code = 1) : Error("RuntimeError", "runtime error", exit_code, false) {}
+};
+
 /// Thrown when parsing an INI file and it is missing
 struct FileError : public ParseError {
     FileError(std::string name) : ParseError("FileError", name, ExitCodes::File) {}