Support specifying options/variables/buildspec in any order

1 files changed, 36 insertions, 31 deletions

diff --git a/build2/b-options b/build2/b-options
index c641ce0..32a8709 100644
--- a/build2/b-options
+++ b/build2/b-options
@@ -356,37 +356,42 @@ namespace build2
     public:
     options ();
 
-    options (int& argc,
-             char** argv,
-             bool erase = false,
-             ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
-             ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
-
-    options (int start,
-             int& argc,
-             char** argv,
-             bool erase = false,
-             ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
-             ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
-
-    options (int& argc,
-             char** argv,
-             int& end,
-             bool erase = false,
-             ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
-             ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
-
-    options (int start,
-             int& argc,
-             char** argv,
-             int& end,
-             bool erase = false,
-             ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
-             ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
-
-    options (::build2::cl::scanner&,
-             ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
-             ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
+    void
+    parse (int& argc,
+           char** argv,
+           bool erase = false,
+           ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
+           ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
+
+    void
+    parse (int start,
+           int& argc,
+           char** argv,
+           bool erase = false,
+           ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
+           ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
+
+    void
+    parse (int& argc,
+           char** argv,
+           int& end,
+           bool erase = false,
+           ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
+           ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
+
+    void
+    parse (int start,
+           int& argc,
+           char** argv,
+           int& end,
+           bool erase = false,
+           ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
+           ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
+
+    void
+    parse (::build2::cl::scanner&,
+           ::build2::cl::unknown_mode option = ::build2::cl::unknown_mode::fail,
+           ::build2::cl::unknown_mode argument = ::build2::cl::unknown_mode::stop);
 
     // Option accessors.
     //