Factor out common CLI types (scanners, etc)

6 files changed, 175 insertions, 919 deletions

diff --git a/libbuild2/build/script/builtin-options.cxx b/libbuild2/build/script/builtin-options.cxx
index 04cd1c2..6fae0b4 100644
--- a/libbuild2/build/script/builtin-options.cxx
+++ b/libbuild2/build/script/builtin-options.cxx
@@ -6,7 +6,7 @@
 
 // Begin prologue.
 //
-#include <libbuild2/build/script/types-parsers.hxx>
+#include <libbuild2/types-parsers.hxx>
 //
 // End prologue.
 
@@ -24,365 +24,160 @@ namespace build2
 {
   namespace build
   {
-    namespace script
+    namespace cli
     {
-      namespace cli
+      template <typename X>
+      struct parser
       {
-        // unknown_option
-        //
-        unknown_option::
-        ~unknown_option () throw ()
-        {
-        }
-
-        void unknown_option::
-        print (::std::ostream& os) const
-        {
-          os << "unknown option '" << option ().c_str () << "'";
-        }
-
-        const char* unknown_option::
-        what () const throw ()
-        {
-          return "unknown option";
-        }
-
-        // unknown_argument
-        //
-        unknown_argument::
-        ~unknown_argument () throw ()
-        {
-        }
-
-        void unknown_argument::
-        print (::std::ostream& os) const
-        {
-          os << "unknown argument '" << argument ().c_str () << "'";
-        }
-
-        const char* unknown_argument::
-        what () const throw ()
-        {
-          return "unknown argument";
-        }
-
-        // missing_value
-        //
-        missing_value::
-        ~missing_value () throw ()
-        {
-        }
-
-        void missing_value::
-        print (::std::ostream& os) const
-        {
-          os << "missing value for option '" << option ().c_str () << "'";
-        }
-
-        const char* missing_value::
-        what () const throw ()
-        {
-          return "missing option value";
-        }
-
-        // invalid_value
-        //
-        invalid_value::
-        ~invalid_value () throw ()
-        {
-        }
-
-        void invalid_value::
-        print (::std::ostream& os) const
+        static void
+        parse (X& x, bool& xs, scanner& s)
         {
-          os << "invalid value '" << value ().c_str () << "' for option '"
-             << option ().c_str () << "'";
+          using namespace std;
 
-          if (!message ().empty ())
-            os << ": " << message ().c_str ();
-        }
-
-        const char* invalid_value::
-        what () const throw ()
-        {
-          return "invalid option value";
-        }
-
-        // eos_reached
-        //
-        void eos_reached::
-        print (::std::ostream& os) const
-        {
-          os << what ();
-        }
-
-        const char* eos_reached::
-        what () const throw ()
-        {
-          return "end of argument stream reached";
-        }
-
-        // scanner
-        //
-        scanner::
-        ~scanner ()
-        {
-        }
-
-        // argv_scanner
-        //
-        bool argv_scanner::
-        more ()
-        {
-          return i_ < argc_;
-        }
-
-        const char* argv_scanner::
-        peek ()
-        {
-          if (i_ < argc_)
-            return argv_[i_];
-          else
-            throw eos_reached ();
-        }
-
-        const char* argv_scanner::
-        next ()
-        {
-          if (i_ < argc_)
+          const char* o (s.next ());
+          if (s.more ())
           {
-            const char* r (argv_[i_]);
-
-            if (erase_)
-            {
-              for (int i (i_ + 1); i < argc_; ++i)
-                argv_[i - 1] = argv_[i];
-
-              --argc_;
-              argv_[argc_] = 0;
-            }
-            else
-              ++i_;
-
-            ++start_position_;
-            return r;
+            string v (s.next ());
+            istringstream is (v);
+            if (!(is >> x && is.peek () == istringstream::traits_type::eof ()))
+              throw invalid_value (o, v);
           }
           else
-            throw eos_reached ();
-        }
+            throw missing_value (o);
 
-        void argv_scanner::
-        skip ()
-        {
-          if (i_ < argc_)
-          {
-            ++i_;
-            ++start_position_;
-          }
-          else
-            throw eos_reached ();
+          xs = true;
         }
+      };
 
-        std::size_t argv_scanner::
-        position ()
+      template <>
+      struct parser<bool>
+      {
+        static void
+        parse (bool& x, scanner& s)
         {
-          return start_position_;
+          s.next ();
+          x = true;
         }
+      };
 
-        // vector_scanner
-        //
-        bool vector_scanner::
-        more ()
+      template <>
+      struct parser<std::string>
+      {
+        static void
+        parse (std::string& x, bool& xs, scanner& s)
         {
-          return i_ < v_.size ();
-        }
+          const char* o (s.next ());
 
-        const char* vector_scanner::
-        peek ()
-        {
-          if (i_ < v_.size ())
-            return v_[i_].c_str ();
+          if (s.more ())
+            x = s.next ();
           else
-            throw eos_reached ();
-        }
+            throw missing_value (o);
 
-        const char* vector_scanner::
-        next ()
-        {
-          if (i_ < v_.size ())
-            return v_[i_++].c_str ();
-          else
-            throw eos_reached ();
+          xs = true;
         }
+      };
 
-        void vector_scanner::
-        skip ()
+      template <typename X>
+      struct parser<std::pair<X, std::size_t> >
+      {
+        static void
+        parse (std::pair<X, std::size_t>& x, bool& xs, scanner& s)
         {
-          if (i_ < v_.size ())
-            ++i_;
-          else
-            throw eos_reached ();
+          x.second = s.position ();
+          parser<X>::parse (x.first, xs, s);
         }
+      };
 
-        std::size_t vector_scanner::
-        position ()
-        {
-          return start_position_ + i_;
+      template <typename X>
+      struct parser<std::vector<X> >
+      {
+        static void
+        parse (std::vector<X>& c, bool& xs, scanner& s)
+        {
+          X x;
+          bool dummy;
+          parser<X>::parse (x, dummy, s);
+          c.push_back (x);
+          xs = true;
         }
+      };
 
-        template <typename X>
-        struct parser
-        {
-          static void
-          parse (X& x, bool& xs, scanner& s)
-          {
-            using namespace std;
-
-            const char* o (s.next ());
-            if (s.more ())
-            {
-              string v (s.next ());
-              istringstream is (v);
-              if (!(is >> x && is.peek () == istringstream::traits_type::eof ()))
-                throw invalid_value (o, v);
-            }
-            else
-              throw missing_value (o);
-
-            xs = true;
-          }
-        };
+      template <typename X, typename C>
+      struct parser<std::set<X, C> >
+      {
+        static void
+        parse (std::set<X, C>& c, bool& xs, scanner& s)
+        {
+          X x;
+          bool dummy;
+          parser<X>::parse (x, dummy, s);
+          c.insert (x);
+          xs = true;
+        }
+      };
 
-        template <>
-        struct parser<bool>
+      template <typename K, typename V, typename C>
+      struct parser<std::map<K, V, C> >
+      {
+        static void
+        parse (std::map<K, V, C>& m, bool& xs, scanner& s)
         {
-          static void
-          parse (bool& x, scanner& s)
-          {
-            s.next ();
-            x = true;
-          }
-        };
+          const char* o (s.next ());
 
-        template <>
-        struct parser<std::string>
-        {
-          static void
-          parse (std::string& x, bool& xs, scanner& s)
+          if (s.more ())
           {
-            const char* o (s.next ());
+            std::size_t pos (s.position ());
+            std::string ov (s.next ());
+            std::string::size_type p = ov.find ('=');
 
-            if (s.more ())
-              x = s.next ();
-            else
-              throw missing_value (o);
+            K k = K ();
+            V v = V ();
+            std::string kstr (ov, 0, p);
+            std::string vstr (ov, (p != std::string::npos ? p + 1 : ov.size ()));
 
-            xs = true;
-          }
-        };
-
-        template <typename X>
-        struct parser<std::pair<X, std::size_t> >
-        {
-          static void
-          parse (std::pair<X, std::size_t>& x, bool& xs, scanner& s)
-          {
-            x.second = s.position ();
-            parser<X>::parse (x.first, xs, s);
-          }
-        };
-
-        template <typename X>
-        struct parser<std::vector<X> >
-        {
-          static void
-          parse (std::vector<X>& c, bool& xs, scanner& s)
-          {
-            X x;
-            bool dummy;
-            parser<X>::parse (x, dummy, s);
-            c.push_back (x);
-            xs = true;
-          }
-        };
+            int ac (2);
+            char* av[] =
+            {
+              const_cast<char*> (o),
+              0
+            };
 
-        template <typename X, typename C>
-        struct parser<std::set<X, C> >
-        {
-          static void
-          parse (std::set<X, C>& c, bool& xs, scanner& s)
-          {
-            X x;
             bool dummy;
-            parser<X>::parse (x, dummy, s);
-            c.insert (x);
-            xs = true;
-          }
-        };
-
-        template <typename K, typename V, typename C>
-        struct parser<std::map<K, V, C> >
-        {
-          static void
-          parse (std::map<K, V, C>& m, bool& xs, scanner& s)
-          {
-            const char* o (s.next ());
-
-            if (s.more ())
+            if (!kstr.empty ())
             {
-              std::size_t pos (s.position ());
-              std::string ov (s.next ());
-              std::string::size_type p = ov.find ('=');
-
-              K k = K ();
-              V v = V ();
-              std::string kstr (ov, 0, p);
-              std::string vstr (ov, (p != std::string::npos ? p + 1 : ov.size ()));
-
-              int ac (2);
-              char* av[] =
-              {
-                const_cast<char*> (o),
-                0
-              };
-
-              bool dummy;
-              if (!kstr.empty ())
-              {
-                av[1] = const_cast<char*> (kstr.c_str ());
-                argv_scanner s (0, ac, av, false, pos);
-                parser<K>::parse (k, dummy, s);
-              }
-
-              if (!vstr.empty ())
-              {
-                av[1] = const_cast<char*> (vstr.c_str ());
-                argv_scanner s (0, ac, av, false, pos);
-                parser<V>::parse (v, dummy, s);
-              }
+              av[1] = const_cast<char*> (kstr.c_str ());
+              argv_scanner s (0, ac, av, false, pos);
+              parser<K>::parse (k, dummy, s);
+            }
 
-              m[k] = v;
+            if (!vstr.empty ())
+            {
+              av[1] = const_cast<char*> (vstr.c_str ());
+              argv_scanner s (0, ac, av, false, pos);
+              parser<V>::parse (v, dummy, s);
             }
-            else
-              throw missing_value (o);
 
-            xs = true;
+            m[k] = v;
           }
-        };
+          else
+            throw missing_value (o);
 
-        template <typename X, typename T, T X::*M>
-        void
-        thunk (X& x, scanner& s)
-        {
-          parser<T>::parse (x.*M, s);
+          xs = true;
         }
+      };
 
-        template <typename X, typename T, T X::*M, bool X::*S>
-        void
-        thunk (X& x, scanner& s)
-        {
-          parser<T>::parse (x.*M, x.*S, s);
-        }
+      template <typename X, typename T, T X::*M>
+      void
+      thunk (X& x, scanner& s)
+      {
+        parser<T>::parse (x.*M, s);
+      }
+
+      template <typename X, typename T, T X::*M, bool X::*S>
+      void
+      thunk (X& x, scanner& s)
+      {
+        parser<T>::parse (x.*M, x.*S, s);
       }
     }
   }
@@ -423,10 +218,10 @@ namespace build2
       parse (int& argc,
              char** argv,
              bool erase,
-             ::build2::build::script::cli::unknown_mode opt,
-             ::build2::build::script::cli::unknown_mode arg)
+             ::build2::build::cli::unknown_mode opt,
+             ::build2::build::cli::unknown_mode arg)
       {
-        ::build2::build::script::cli::argv_scanner s (argc, argv, erase);
+        ::build2::build::cli::argv_scanner s (argc, argv, erase);
         bool r = _parse (s, opt, arg);
         return r;
       }
@@ -436,10 +231,10 @@ namespace build2
              int& argc,
              char** argv,
              bool erase,
-             ::build2::build::script::cli::unknown_mode opt,
-             ::build2::build::script::cli::unknown_mode arg)
+             ::build2::build::cli::unknown_mode opt,
+             ::build2::build::cli::unknown_mode arg)
       {
-        ::build2::build::script::cli::argv_scanner s (start, argc, argv, erase);
+        ::build2::build::cli::argv_scanner s (start, argc, argv, erase);
         bool r = _parse (s, opt, arg);
         return r;
       }
@@ -449,10 +244,10 @@ namespace build2
              char** argv,
              int& end,
              bool erase,
-             ::build2::build::script::cli::unknown_mode opt,
-             ::build2::build::script::cli::unknown_mode arg)
+             ::build2::build::cli::unknown_mode opt,
+             ::build2::build::cli::unknown_mode arg)
       {
-        ::build2::build::script::cli::argv_scanner s (argc, argv, erase);
+        ::build2::build::cli::argv_scanner s (argc, argv, erase);
         bool r = _parse (s, opt, arg);
         end = s.end ();
         return r;
@@ -464,26 +259,26 @@ namespace build2
              char** argv,
              int& end,
              bool erase,
-             ::build2::build::script::cli::unknown_mode opt,
-             ::build2::build::script::cli::unknown_mode arg)
+             ::build2::build::cli::unknown_mode opt,
+             ::build2::build::cli::unknown_mode arg)
       {
-        ::build2::build::script::cli::argv_scanner s (start, argc, argv, erase);
+        ::build2::build::cli::argv_scanner s (start, argc, argv, erase);
         bool r = _parse (s, opt, arg);
         end = s.end ();
         return r;
       }
 
       bool depdb_dyndep_options::
-      parse (::build2::build::script::cli::scanner& s,
-             ::build2::build::script::cli::unknown_mode opt,
-             ::build2::build::script::cli::unknown_mode arg)
+      parse (::build2::build::cli::scanner& s,
+             ::build2::build::cli::unknown_mode opt,
+             ::build2::build::cli::unknown_mode arg)
       {
         bool r = _parse (s, opt, arg);
         return r;
       }
 
       typedef
-      std::map<std::string, void (*) (depdb_dyndep_options&, ::build2::build::script::cli::scanner&)>
+      std::map<std::string, void (*) (depdb_dyndep_options&, ::build2::build::cli::scanner&)>
       _cli_depdb_dyndep_options_map;
 
       static _cli_depdb_dyndep_options_map _cli_depdb_dyndep_options_map_;
@@ -493,37 +288,37 @@ namespace build2
         _cli_depdb_dyndep_options_map_init ()
         {
           _cli_depdb_dyndep_options_map_["--file"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, path, &depdb_dyndep_options::file_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, path, &depdb_dyndep_options::file_,
             &depdb_dyndep_options::file_specified_ >;
           _cli_depdb_dyndep_options_map_["--format"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::format_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::format_,
             &depdb_dyndep_options::format_specified_ >;
           _cli_depdb_dyndep_options_map_["--what"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::what_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::what_,
             &depdb_dyndep_options::what_specified_ >;
           _cli_depdb_dyndep_options_map_["--include-path"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, dir_paths, &depdb_dyndep_options::include_path_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, dir_paths, &depdb_dyndep_options::include_path_,
             &depdb_dyndep_options::include_path_specified_ >;
           _cli_depdb_dyndep_options_map_["-I"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, dir_paths, &depdb_dyndep_options::include_path_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, dir_paths, &depdb_dyndep_options::include_path_,
             &depdb_dyndep_options::include_path_specified_ >;
           _cli_depdb_dyndep_options_map_["--default-type"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::default_type_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, string, &depdb_dyndep_options::default_type_,
             &depdb_dyndep_options::default_type_specified_ >;
           _cli_depdb_dyndep_options_map_["--adhoc"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, bool, &depdb_dyndep_options::adhoc_ >;
+          &::build2::build::cli::thunk< depdb_dyndep_options, bool, &depdb_dyndep_options::adhoc_ >;
           _cli_depdb_dyndep_options_map_["--cwd"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, dir_path, &depdb_dyndep_options::cwd_,
+          &::build2::build::cli::thunk< depdb_dyndep_options, dir_path, &depdb_dyndep_options::cwd_,
             &depdb_dyndep_options::cwd_specified_ >;
           _cli_depdb_dyndep_options_map_["--drop-cycles"] =
-          &::build2::build::script::cli::thunk< depdb_dyndep_options, bool, &depdb_dyndep_options::drop_cycles_ >;
+          &::build2::build::cli::thunk< depdb_dyndep_options, bool, &depdb_dyndep_options::drop_cycles_ >;
         }
       };
 
       static _cli_depdb_dyndep_options_map_init _cli_depdb_dyndep_options_map_init_;
 
       bool depdb_dyndep_options::
-      _parse (const char* o, ::build2::build::script::cli::scanner& s)
+      _parse (const char* o, ::build2::build::cli::scanner& s)
       {
         _cli_depdb_dyndep_options_map::const_iterator i (_cli_depdb_dyndep_options_map_.find (o));
 
@@ -537,13 +332,13 @@ namespace build2
       }
 
       bool depdb_dyndep_options::
-      _parse (::build2::build::script::cli::scanner& s,
-              ::build2::build::script::cli::unknown_mode opt_mode,
-              ::build2::build::script::cli::unknown_mode arg_mode)
+      _parse (::build2::build::cli::scanner& s,
+              ::build2::build::cli::unknown_mode opt_mode,
+              ::build2::build::cli::unknown_mode arg_mode)
       {
         // Can't skip combined flags (--no-combined-flags).
         //
-        assert (opt_mode != ::build2::build::script::cli::unknown_mode::skip);
+        assert (opt_mode != ::build2::build::cli::unknown_mode::skip);
 
         bool r = false;
         bool opt = true;
@@ -585,14 +380,14 @@ namespace build2
                   const_cast<char*> (v)
                 };
 
-                ::build2::build::script::cli::argv_scanner ns (0, ac, av);
+                ::build2::build::cli::argv_scanner ns (0, ac, av);
 
                 if (_parse (co.c_str (), ns))
                 {
                   // Parsed the option but not its value?
                   //
                   if (ns.end () != 2)
-                    throw ::build2::build::script::cli::invalid_value (co, v);
+                    throw ::build2::build::cli::invalid_value (co, v);
 
                   s.next ();
                   r = true;
@@ -633,7 +428,7 @@ namespace build2
                       cf
                     };
 
-                    ::build2::build::script::cli::argv_scanner ns (0, ac, av);
+                    ::build2::build::cli::argv_scanner ns (0, ac, av);
 
                     if (!_parse (cf, ns))
                       break;
@@ -658,19 +453,19 @@ namespace build2
 
               switch (opt_mode)
               {
-                case ::build2::build::script::cli::unknown_mode::skip:
+                case ::build2::build::cli::unknown_mode::skip:
                 {
                   s.skip ();
                   r = true;
                   continue;
                 }
-                case ::build2::build::script::cli::unknown_mode::stop:
+                case ::build2::build::cli::unknown_mode::stop:
                 {
                   break;
                 }
-                case ::build2::build::script::cli::unknown_mode::fail:
+                case ::build2::build::cli::unknown_mode::fail:
                 {
-                  throw ::build2::build::script::cli::unknown_option (o);
+                  throw ::build2::build::cli::unknown_option (o);
                 }
               }
 
@@ -680,19 +475,19 @@ namespace build2
 
           switch (arg_mode)
           {
-            case ::build2::build::script::cli::unknown_mode::skip:
+            case ::build2::build::cli::unknown_mode::skip:
             {
               s.skip ();
               r = true;
               continue;
             }
-            case ::build2::build::script::cli::unknown_mode::stop:
+            case ::build2::build::cli::unknown_mode::stop:
             {
               break;
             }
-            case ::build2::build::script::cli::unknown_mode::fail:
+            case ::build2::build::cli::unknown_mode::fail:
             {
-              throw ::build2::build::script::cli::unknown_argument (o);
+              throw ::build2::build::cli::unknown_argument (o);
             }
           }
 
diff --git a/libbuild2/build/script/builtin-options.hxx b/libbuild2/build/script/builtin-options.hxx
index 60020c9..544daca 100644
--- a/libbuild2/build/script/builtin-options.hxx
+++ b/libbuild2/build/script/builtin-options.hxx
@@ -12,285 +12,10 @@
 //
 // End prologue.
 
-#include <vector>
-#include <iosfwd>
-#include <string>
-#include <cstddef>
-#include <exception>
-
-#ifndef CLI_POTENTIALLY_UNUSED
-#  if defined(_MSC_VER) || defined(__xlC__)
-#    define CLI_POTENTIALLY_UNUSED(x) (void*)&x
-#  else
-#    define CLI_POTENTIALLY_UNUSED(x) (void)x
-#  endif
-#endif
-
-namespace build2
-{
-  namespace build
-  {
-    namespace script
-    {
-      namespace cli
-      {
-        class unknown_mode
-        {
-          public:
-          enum value
-          {
-            skip,
-            stop,
-            fail
-          };
-
-          unknown_mode (value);
-
-          operator value () const 
-          {
-            return v_;
-          }
-
-          private:
-          value v_;
-        };
-
-        // Exceptions.
-        //
-
-        class exception: public std::exception
-        {
-          public:
-          virtual void
-          print (::std::ostream&) const = 0;
-        };
-
-        ::std::ostream&
-        operator<< (::std::ostream&, const exception&);
-
-        class unknown_option: public exception
-        {
-          public:
-          virtual
-          ~unknown_option () throw ();
-
-          unknown_option (const std::string& option);
-
-          const std::string&
-          option () const;
-
-          virtual void
-          print (::std::ostream&) const;
-
-          virtual const char*
-          what () const throw ();
-
-          private:
-          std::string option_;
-        };
-
-        class unknown_argument: public exception
-        {
-          public:
-          virtual
-          ~unknown_argument () throw ();
-
-          unknown_argument (const std::string& argument);
-
-          const std::string&
-          argument () const;
-
-          virtual void
-          print (::std::ostream&) const;
-
-          virtual const char*
-          what () const throw ();
-
-          private:
-          std::string argument_;
-        };
-
-        class missing_value: public exception
-        {
-          public:
-          virtual
-          ~missing_value () throw ();
-
-          missing_value (const std::string& option);
-
-          const std::string&
-          option () const;
-
-          virtual void
-          print (::std::ostream&) const;
-
-          virtual const char*
-          what () const throw ();
-
-          private:
-          std::string option_;
-        };
-
-        class invalid_value: public exception
-        {
-          public:
-          virtual
-          ~invalid_value () throw ();
-
-          invalid_value (const std::string& option,
-                         const std::string& value,
-                         const std::string& message = std::string ());
-
-          const std::string&
-          option () const;
-
-          const std::string&
-          value () const;
-
-          const std::string&
-          message () const;
-
-          virtual void
-          print (::std::ostream&) const;
-
-          virtual const char*
-          what () const throw ();
-
-          private:
-          std::string option_;
-          std::string value_;
-          std::string message_;
-        };
-
-        class eos_reached: public exception
-        {
-          public:
-          virtual void
-          print (::std::ostream&) const;
-
-          virtual const char*
-          what () const throw ();
-        };
-
-        // Command line argument scanner interface.
-        //
-        // The values returned by next() are guaranteed to be valid
-        // for the two previous arguments up until a call to a third
-        // peek() or next().
-        //
-        // The position() function returns a monotonically-increasing
-        // number which, if stored, can later be used to determine the
-        // relative position of the argument returned by the following
-        // call to next(). Note that if multiple scanners are used to
-        // extract arguments from multiple sources, then the end
-        // position of the previous scanner should be used as the
-        // start position of the next.
-        //
-        class scanner
-        {
-          public:
-          virtual
-          ~scanner ();
-
-          virtual bool
-          more () = 0;
-
-          virtual const char*
-          peek () = 0;
-
-          virtual const char*
-          next () = 0;
-
-          virtual void
-          skip () = 0;
-
-          virtual std::size_t
-          position () = 0;
-        };
-
-        class argv_scanner: public scanner
-        {
-          public:
-          argv_scanner (int& argc,
-                        char** argv,
-                        bool erase = false,
-                        std::size_t start_position = 0);
-
-          argv_scanner (int start,
-                        int& argc,
-                        char** argv,
-                        bool erase = false,
-                        std::size_t start_position = 0);
-
-          int
-          end () const;
-
-          virtual bool
-          more ();
-
-          virtual const char*
-          peek ();
-
-          virtual const char*
-          next ();
-
-          virtual void
-          skip ();
-
-          virtual std::size_t
-          position ();
-
-          protected:
-          std::size_t start_position_;
-          int i_;
-          int& argc_;
-          char** argv_;
-          bool erase_;
-        };
-
-        class vector_scanner: public scanner
-        {
-          public:
-          vector_scanner (const std::vector<std::string>&,
-                          std::size_t start = 0,
-                          std::size_t start_position = 0);
-
-          std::size_t
-          end () const;
-
-          void
-          reset (std::size_t start = 0, std::size_t start_position = 0);
-
-          virtual bool
-          more ();
-
-          virtual const char*
-          peek ();
-
-          virtual const char*
-          next ();
-
-          virtual void
-          skip ();
-
-          virtual std::size_t
-          position ();
-
-          private:
-          std::size_t start_position_;
-          const std::vector<std::string>& v_;
-          std::size_t i_;
-        };
-
-        template <typename X>
-        struct parser;
-      }
-    }
-  }
-}
-
 #include <libbuild2/types.hxx>
 
+#include <libbuild2/common-options.hxx>
+
 namespace build2
 {
   namespace build
@@ -308,24 +33,24 @@ namespace build2
         parse (int& argc,
                char** argv,
                bool erase = false,
-               ::build2::build::script::cli::unknown_mode option = ::build2::build::script::cli::unknown_mode::fail,
-               ::build2::build::script::cli::unknown_mode argument = ::build2::build::script::cli::unknown_mode::stop);
+               ::build2::build::cli::unknown_mode option = ::build2::build::cli::unknown_mode::fail,
+               ::build2::build::cli::unknown_mode argument = ::build2::build::cli::unknown_mode::stop);
 
         bool
         parse (int start,
                int& argc,
                char** argv,
                bool erase = false,
-               ::build2::build::script::cli::unknown_mode option = ::build2::build::script::cli::unknown_mode::fail,
-               ::build2::build::script::cli::unknown_mode argument = ::build2::build::script::cli::unknown_mode::stop);
+               ::build2::build::cli::unknown_mode option = ::build2::build::cli::unknown_mode::fail,
+               ::build2::build::cli::unknown_mode argument = ::build2::build::cli::unknown_mode::stop);
 
         bool
         parse (int& argc,
                char** argv,
                int& end,
                bool erase = false,
-               ::build2::build::script::cli::unknown_mode option = ::build2::build::script::cli::unknown_mode::fail,
-               ::build2::build::script::cli::unknown_mode argument = ::build2::build::script::cli::unknown_mode::stop);
+               ::build2::build::cli::unknown_mode option = ::build2::build::cli::unknown_mode::fail,
+               ::build2::build::cli::unknown_mode argument = ::build2::build::cli::unknown_mode::stop);
 
         bool
         parse (int start,
@@ -333,13 +58,13 @@ namespace build2
                char** argv,
                int& end,
                bool erase = false,
-               ::build2::build::script::cli::unknown_mode option = ::build2::build::script::cli::unknown_mode::fail,
-               ::build2::build::script::cli::unknown_mode argument = ::build2::build::script::cli::unknown_mode::stop);
+               ::build2::build::cli::unknown_mode option = ::build2::build::cli::unknown_mode::fail,
+               ::build2::build::cli::unknown_mode argument = ::build2::build::cli::unknown_mode::stop);
 
         bool
-        parse (::build2::build::script::cli::scanner&,
-               ::build2::build::script::cli::unknown_mode option = ::build2::build::script::cli::unknown_mode::fail,
-               ::build2::build::script::cli::unknown_mode argument = ::build2::build::script::cli::unknown_mode::stop);
+        parse (::build2::build::cli::scanner&,
+               ::build2::build::cli::unknown_mode option = ::build2::build::cli::unknown_mode::fail,
+               ::build2::build::cli::unknown_mode argument = ::build2::build::cli::unknown_mode::stop);
 
         // Option accessors and modifiers.
         //
@@ -455,13 +180,13 @@ namespace build2
         //
         protected:
         bool
-        _parse (const char*, ::build2::build::script::cli::scanner&);
+        _parse (const char*, ::build2::build::cli::scanner&);
 
         private:
         bool
-        _parse (::build2::build::script::cli::scanner&,
-                ::build2::build::script::cli::unknown_mode option,
-                ::build2::build::script::cli::unknown_mode argument);
+        _parse (::build2::build::cli::scanner&,
+                ::build2::build::cli::unknown_mode option,
+                ::build2::build::cli::unknown_mode argument);
 
         public:
         path file_;
diff --git a/libbuild2/build/script/builtin-options.ixx b/libbuild2/build/script/builtin-options.ixx
index 6f91b2c..ea06a0f 100644
--- a/libbuild2/build/script/builtin-options.ixx
+++ b/libbuild2/build/script/builtin-options.ixx
@@ -9,167 +9,6 @@
 //
 // End prologue.
 
-#include <cassert>
-
-namespace build2
-{
-  namespace build
-  {
-    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,
-                      std::size_t sp)
-        : start_position_ (sp + 1),
-          i_ (1),
-          argc_ (argc),
-          argv_ (argv),
-          erase_ (erase)
-        {
-        }
-
-        inline argv_scanner::
-        argv_scanner (int start,
-                      int& argc,
-                      char** argv,
-                      bool erase,
-                      std::size_t sp)
-        : start_position_ (sp + static_cast<std::size_t> (start)),
-          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,
-                        std::size_t sp)
-        : start_position_ (sp), v_ (v), i_ (i)
-        {
-        }
-
-        inline std::size_t vector_scanner::
-        end () const
-        {
-          return i_;
-        }
-
-        inline void vector_scanner::
-        reset (std::size_t i, std::size_t sp)
-        {
-          i_ = i;
-          start_position_ = sp;
-        }
-      }
-    }
-  }
-}
-
 namespace build2
 {
   namespace build
diff --git a/libbuild2/build/script/builtin.cli b/libbuild2/build/script/builtin.cli
index 6292f48..4e2df4b 100644
--- a/libbuild2/build/script/builtin.cli
+++ b/libbuild2/build/script/builtin.cli
@@ -3,6 +3,8 @@
 
 include <libbuild2/types.hxx>;
 
+include <libbuild2/common.cli>;
+
 // Note that options in this file are undocumented because we generate neither
 // the usage printing code nor man pages. Instead, they are documented in the
 // manual.
diff --git a/libbuild2/build/script/types-parsers.cxx b/libbuild2/build/script/types-parsers.cxx
deleted file mode 100644
index 9ecfa13..0000000
--- a/libbuild2/build/script/types-parsers.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-// file      : libbuild2/build/script/types-parsers.cxx -*- C++ -*-
-// license   : MIT; see accompanying LICENSE file
-
-#include <libbuild2/build/script/types-parsers.hxx>
-
-#include <libbuild2/build/script/builtin-options.hxx> // cli namespace
-
-namespace build2
-{
-  namespace build
-  {
-    namespace script
-    {
-      namespace cli
-      {
-        template <typename T>
-        static void
-        parse_path (T& x, scanner& s)
-        {
-          const char* o (s.next ());
-
-          if (!s.more ())
-            throw missing_value (o);
-
-          const char* v (s.next ());
-
-          try
-          {
-            x = T (v);
-
-            if (x.empty ())
-              throw invalid_value (o, v);
-          }
-          catch (const invalid_path&)
-          {
-            throw invalid_value (o, v);
-          }
-        }
-
-        void parser<path>::
-        parse (path& x, bool& xs, scanner& s)
-        {
-          xs = true;
-          parse_path (x, s);
-        }
-
-        void parser<dir_path>::
-        parse (dir_path& x, bool& xs, scanner& s)
-        {
-          xs = true;
-          parse_path (x, s);
-        }
-      }
-    }
-  }
-}
diff --git a/libbuild2/build/script/types-parsers.hxx b/libbuild2/build/script/types-parsers.hxx
deleted file mode 100644
index a42dab7..0000000
--- a/libbuild2/build/script/types-parsers.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-// file      : libbuild2/build/script/types-parsers.hxx -*- C++ -*-
-// license   : MIT; see accompanying LICENSE file
-
-// CLI parsers, included into the generated source files.
-//
-
-#ifndef LIBBUILD2_BUILD_SCRIPT_TYPES_PARSERS_HXX
-#define LIBBUILD2_BUILD_SCRIPT_TYPES_PARSERS_HXX
-
-#include <libbuild2/types.hxx>
-
-namespace build2
-{
-  namespace build
-  {
-    namespace script
-    {
-      namespace cli
-      {
-        class scanner;
-
-        template <typename T>
-        struct parser;
-
-        template <>
-        struct parser<path>
-        {
-          static void
-          parse (path&, bool&, scanner&);
-
-          static void
-          merge (path& b, const path& a) {b = a;}
-        };
-
-        template <>
-        struct parser<dir_path>
-        {
-          static void
-          parse (dir_path&, bool&, scanner&);
-
-          static void
-          merge (dir_path& b, const dir_path& a) {b = a;}
-        };
-      }
-    }
-  }
-}
-
-#endif // LIBBUILD2_BUILD_SCRIPT_TYPES_PARSERS_HXX