1 files changed, 57 insertions, 140 deletions
diff --git a/libbuild2/script/builtin-options.ixx b/libbuild2/script/builtin-options.ixx
index bbd12b1..575eb95 100644
--- a/libbuild2/script/builtin-options.ixx
+++ b/libbuild2/script/builtin-options.ixx
@@ -9,146 +9,6 @@
 //
 // End prologue.
 
-#include <cassert>
-
-namespace build2
-{
-  namespace script
-  {
-    namespace cli
-    {
-      // unknown_mode
-      //
-      inline unknown_mode::
-      unknown_mode (value v)
-      : v_ (v)
-      {
-      }
-
-      // exception
-      //
-      inline ::std::ostream&
-      operator<< (::std::ostream& os, const exception& e)
-      {
-        e.print (os);
-        return os;
-      }
-
-      // unknown_option
-      //
-      inline unknown_option::
-      unknown_option (const std::string& option)
-      : option_ (option)
-      {
-      }
-
-      inline const std::string& unknown_option::
-      option () const
-      {
-        return option_;
-      }
-
-      // unknown_argument
-      //
-      inline unknown_argument::
-      unknown_argument (const std::string& argument)
-      : argument_ (argument)
-      {
-      }
-
-      inline const std::string& unknown_argument::
-      argument () const
-      {
-        return argument_;
-      }
-
-      // missing_value
-      //
-      inline missing_value::
-      missing_value (const std::string& option)
-      : option_ (option)
-      {
-      }
-
-      inline const std::string& missing_value::
-      option () const
-      {
-        return option_;
-      }
-
-      // invalid_value
-      //
-      inline invalid_value::
-      invalid_value (const std::string& option,
-                     const std::string& value,
-                     const std::string& message)
-      : option_ (option),
-        value_ (value),
-        message_ (message)
-      {
-      }
-
-      inline const std::string& invalid_value::
-      option () const
-      {
-        return option_;
-      }
-
-      inline const std::string& invalid_value::
-      value () const
-      {
-        return value_;
-      }
-
-      inline const std::string& invalid_value::
-      message () const
-      {
-        return message_;
-      }
-
-      // argv_scanner
-      //
-      inline argv_scanner::
-      argv_scanner (int& argc, char** argv, bool erase)
-      : i_ (1), argc_ (argc), argv_ (argv), erase_ (erase)
-      {
-      }
-
-      inline argv_scanner::
-      argv_scanner (int start, int& argc, char** argv, bool erase)
-      : i_ (start), argc_ (argc), argv_ (argv), erase_ (erase)
-      {
-      }
-
-      inline int argv_scanner::
-      end () const
-      {
-        return i_;
-      }
-
-      // vector_scanner
-      //
-      inline vector_scanner::
-      vector_scanner (const std::vector<std::string>& v, std::size_t i)
-      : v_ (v), i_ (i)
-      {
-      }
-
-      inline std::size_t vector_scanner::
-      end () const
-      {
-        return i_;
-      }
-
-      inline void vector_scanner::
-      reset (std::size_t i)
-      {
-        i_ = i;
-      }
-    }
-  }
-}
-
 namespace build2
 {
   namespace script
@@ -293,6 +153,63 @@ namespace build2
     {
       this->clear_specified_ = x;
     }
+
+    // for_options
+    //
+
+    inline const bool& for_options::
+    exact () const
+    {
+      return this->exact_;
+    }
+
+    inline bool& for_options::
+    exact ()
+    {
+      return this->exact_;
+    }
+
+    inline void for_options::
+    exact (const bool& x)
+    {
+      this->exact_ = x;
+    }
+
+    inline const bool& for_options::
+    newline () const
+    {
+      return this->newline_;
+    }
+
+    inline bool& for_options::
+    newline ()
+    {
+      return this->newline_;
+    }
+
+    inline void for_options::
+    newline (const bool& x)
+    {
+      this->newline_ = x;
+    }
+
+    inline const bool& for_options::
+    whitespace () const
+    {
+      return this->whitespace_;
+    }
+
+    inline bool& for_options::
+    whitespace ()
+    {
+      return this->whitespace_;
+    }
+
+    inline void for_options::
+    whitespace (const bool& x)
+    {
+      this->whitespace_ = x;
+    }
   }
 }