From 840354da0c54a5036c68cc75eb069d19ac36d0e5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Feb 2016 10:58:26 +0200
Subject: Support specifying options/variables/buildspec in any order

---
 build2/b-options | 67 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

(limited to 'build2/b-options')

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.
     //
-- 
cgit v1.1