From 83c09ca38fdc7fa97d5cb547eb6c51ddca48cc4d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 1 Jul 2022 13:23:59 +0300
Subject: Regenerate options parsing files

---
 libbuild2/script/builtin-options.cxx | 53 ++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 12 deletions(-)

(limited to 'libbuild2/script')

diff --git a/libbuild2/script/builtin-options.cxx b/libbuild2/script/builtin-options.cxx
index 7589faf..8e15ddd 100644
--- a/libbuild2/script/builtin-options.cxx
+++ b/libbuild2/script/builtin-options.cxx
@@ -18,6 +18,7 @@
 #include <utility>
 #include <ostream>
 #include <sstream>
+#include <cstring>
 
 namespace build2
 {
@@ -52,10 +53,31 @@ namespace build2
       struct parser<bool>
       {
         static void
-        parse (bool& x, scanner& s)
+        parse (bool& x, bool& xs, scanner& s)
         {
-          s.next ();
-          x = true;
+          const char* o (s.next ());
+
+          if (s.more ())
+          {
+            const char* v (s.next ());
+
+            if (std::strcmp (v, "1")    == 0 ||
+                std::strcmp (v, "true") == 0 ||
+                std::strcmp (v, "TRUE") == 0 ||
+                std::strcmp (v, "True") == 0)
+              x = true;
+            else if (std::strcmp (v, "0")     == 0 ||
+                     std::strcmp (v, "false") == 0 ||
+                     std::strcmp (v, "FALSE") == 0 ||
+                     std::strcmp (v, "False") == 0)
+              x = false;
+            else
+              throw invalid_value (o, v);
+          }
+          else
+            throw missing_value (o);
+
+          xs = true;
         }
       };
 
@@ -172,6 +194,14 @@ namespace build2
         parser<T>::parse (x.*M, s);
       }
 
+      template <typename X, bool X::*M>
+      void
+      thunk (X& x, scanner& s)
+      {
+        s.next ();
+        x.*M = true;
+      }
+
       template <typename X, typename T, T X::*M, bool X::*S>
       void
       thunk (X& x, scanner& s)
@@ -183,7 +213,6 @@ namespace build2
 }
 
 #include <map>
-#include <cstring>
 
 namespace build2
 {
@@ -284,17 +313,17 @@ namespace build2
       _cli_set_options_map_init ()
       {
         _cli_set_options_map_["--exact"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::exact_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::exact_ >;
         _cli_set_options_map_["-e"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::exact_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::exact_ >;
         _cli_set_options_map_["--newline"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::newline_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::newline_ >;
         _cli_set_options_map_["-n"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::newline_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::newline_ >;
         _cli_set_options_map_["--whitespace"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::whitespace_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::whitespace_ >;
         _cli_set_options_map_["-w"] =
-        &::build2::build::cli::thunk< set_options, bool, &set_options::whitespace_ >;
+        &::build2::build::cli::thunk< set_options, &set_options::whitespace_ >;
       }
     };
 
@@ -563,9 +592,9 @@ namespace build2
       _cli_timeout_options_map_init ()
       {
         _cli_timeout_options_map_["--success"] =
-        &::build2::build::cli::thunk< timeout_options, bool, &timeout_options::success_ >;
+        &::build2::build::cli::thunk< timeout_options, &timeout_options::success_ >;
         _cli_timeout_options_map_["-s"] =
-        &::build2::build::cli::thunk< timeout_options, bool, &timeout_options::success_ >;
+        &::build2::build::cli::thunk< timeout_options, &timeout_options::success_ >;
       }
     };
 
-- 
cgit v1.1