1 files changed, 70 insertions, 9 deletions

diff --git a/libbutl/builtin-options.hxx b/libbutl/builtin-options.hxx
index 6288e54..70179dd 100644
--- a/libbutl/builtin-options.hxx
+++ b/libbutl/builtin-options.hxx
@@ -68,7 +68,7 @@ namespace butl
     {
       public:
       virtual
-      ~unknown_option () throw ();
+      ~unknown_option () noexcept;
 
       unknown_option (const std::string& option);
 
@@ -79,7 +79,7 @@ namespace butl
       print (::std::ostream&) const;
 
       virtual const char*
-      what () const throw ();
+      what () const noexcept;
 
       private:
       std::string option_;
@@ -89,7 +89,7 @@ namespace butl
     {
       public:
       virtual
-      ~unknown_argument () throw ();
+      ~unknown_argument () noexcept;
 
       unknown_argument (const std::string& argument);
 
@@ -100,7 +100,7 @@ namespace butl
       print (::std::ostream&) const;
 
       virtual const char*
-      what () const throw ();
+      what () const noexcept;
 
       private:
       std::string argument_;
@@ -110,7 +110,7 @@ namespace butl
     {
       public:
       virtual
-      ~missing_value () throw ();
+      ~missing_value () noexcept;
 
       missing_value (const std::string& option);
 
@@ -121,7 +121,7 @@ namespace butl
       print (::std::ostream&) const;
 
       virtual const char*
-      what () const throw ();
+      what () const noexcept;
 
       private:
       std::string option_;
@@ -131,7 +131,7 @@ namespace butl
     {
       public:
       virtual
-      ~invalid_value () throw ();
+      ~invalid_value () noexcept;
 
       invalid_value (const std::string& option,
                      const std::string& value,
@@ -150,7 +150,7 @@ namespace butl
       print (::std::ostream&) const;
 
       virtual const char*
-      what () const throw ();
+      what () const noexcept;
 
       private:
       std::string option_;
@@ -165,7 +165,7 @@ namespace butl
       print (::std::ostream&) const;
 
       virtual const char*
-      what () const throw ();
+      what () const noexcept;
     };
 
     // Command line argument scanner interface.
@@ -484,6 +484,67 @@ namespace butl
     bool utc_;
   };
 
+  class find_options
+  {
+    public:
+    find_options ();
+
+    // Return true if anything has been parsed.
+    //
+    bool
+    parse (int& argc,
+           char** argv,
+           bool erase = false,
+           ::butl::cli::unknown_mode option = ::butl::cli::unknown_mode::fail,
+           ::butl::cli::unknown_mode argument = ::butl::cli::unknown_mode::stop);
+
+    bool
+    parse (int start,
+           int& argc,
+           char** argv,
+           bool erase = false,
+           ::butl::cli::unknown_mode option = ::butl::cli::unknown_mode::fail,
+           ::butl::cli::unknown_mode argument = ::butl::cli::unknown_mode::stop);
+
+    bool
+    parse (int& argc,
+           char** argv,
+           int& end,
+           bool erase = false,
+           ::butl::cli::unknown_mode option = ::butl::cli::unknown_mode::fail,
+           ::butl::cli::unknown_mode argument = ::butl::cli::unknown_mode::stop);
+
+    bool
+    parse (int start,
+           int& argc,
+           char** argv,
+           int& end,
+           bool erase = false,
+           ::butl::cli::unknown_mode option = ::butl::cli::unknown_mode::fail,
+           ::butl::cli::unknown_mode argument = ::butl::cli::unknown_mode::stop);
+
+    bool
+    parse (::butl::cli::scanner&,
+           ::butl::cli::unknown_mode option = ::butl::cli::unknown_mode::fail,
+           ::butl::cli::unknown_mode argument = ::butl::cli::unknown_mode::stop);
+
+    // Option accessors.
+    //
+    // Implementation details.
+    //
+    protected:
+    bool
+    _parse (const char*, ::butl::cli::scanner&);
+
+    private:
+    bool
+    _parse (::butl::cli::scanner&,
+            ::butl::cli::unknown_mode option,
+            ::butl::cli::unknown_mode argument);
+
+    public:
+  };
+
   class ln_options
   {
     public: