Add support for dynamic dependencies in ad hoc Buildscript recipes

Specifically, add the new `depdb dyndep` builtin that can be used to extract
dynamic dependencies from a program run or a file. For example:

obje{hello.o}: cxx{hello}
{{
  s = $path($<[0])

  depdb dyndep $cxx.poptions $cc.poptions --what=header --default-prereq-type=h -- $cxx.path $cxx.poptions $cc.poptions $cxx.mode -M -MG $s

  diag c++ ($<[0])

  o = $path($>)
  $cxx.path $cxx.poptions $cc.poptions $cc.coptions $cxx.coptions $cxx.mode -o $o -c $s
}}

Currently only the `make` dependency format is supported.

1 files changed, 701 insertions, 0 deletions

diff --git a/libbuild2/build/script/builtin-options.cxx b/libbuild2/build/script/builtin-options.cxx
new file mode 100644
index 0000000..cf99b12
--- /dev/null
+++ b/libbuild2/build/script/builtin-options.cxx
@@ -0,0 +1,701 @@
+// -*- C++ -*-
+//
+// This file was generated by CLI, a command line interface
+// compiler for C++.
+//
+
+// Begin prologue.
+//
+#include <libbuild2/build/script/types-parsers.hxx>
+//
+// End prologue.
+
+#include <libbuild2/build/script/builtin-options.hxx>
+
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include <utility>
+#include <ostream>
+#include <sstream>
+
+namespace build2
+{
+  namespace build
+  {
+    namespace script
+    {
+      namespace cli
+      {
+        // 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
+        {
+          os << "invalid value '" << value ().c_str () << "' for option '"
+             << option ().c_str () << "'";
+
+          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* 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;
+          }
+          else
+            throw eos_reached ();
+        }
+
+        void argv_scanner::
+        skip ()
+        {
+          if (i_ < argc_)
+          {
+            ++i_;
+            ++start_position_;
+          }
+          else
+            throw eos_reached ();
+        }
+
+        std::size_t argv_scanner::
+        position ()
+        {
+          return start_position_;
+        }
+
+        // vector_scanner
+        //
+        bool vector_scanner::
+        more ()
+        {
+          return i_ < v_.size ();
+        }
+
+        const char* vector_scanner::
+        peek ()
+        {
+          if (i_ < v_.size ())
+            return v_[i_].c_str ();
+          else
+            throw eos_reached ();
+        }
+
+        const char* vector_scanner::
+        next ()
+        {
+          if (i_ < v_.size ())
+            return v_[i_++].c_str ();
+          else
+            throw eos_reached ();
+        }
+
+        void vector_scanner::
+        skip ()
+        {
+          if (i_ < v_.size ())
+            ++i_;
+          else
+            throw eos_reached ();
+        }
+
+        std::size_t vector_scanner::
+        position ()
+        {
+          return start_position_ + i_;
+        }
+
+        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 <>
+        struct parser<bool>
+        {
+          static void
+          parse (bool& x, scanner& s)
+          {
+            s.next ();
+            x = true;
+          }
+        };
+
+        template <>
+        struct parser<std::string>
+        {
+          static void
+          parse (std::string& x, bool& xs, scanner& s)
+          {
+            const char* o (s.next ());
+
+            if (s.more ())
+              x = s.next ();
+            else
+              throw missing_value (o);
+
+            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;
+          }
+        };
+
+        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 ())
+            {
+              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);
+              }
+
+              m[k] = v;
+            }
+            else
+              throw missing_value (o);
+
+            xs = true;
+          }
+        };
+
+        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);
+        }
+      }
+    }
+  }
+}
+
+#include <map>
+#include <cstring>
+
+namespace build2
+{
+  namespace build
+  {
+    namespace script
+    {
+      // depdb_dep_options
+      //
+
+      depdb_dep_options::
+      depdb_dep_options ()
+      : file_ (),
+        file_specified_ (false),
+        format_ (),
+        format_specified_ (false),
+        what_ (),
+        what_specified_ (false),
+        include_path_ (),
+        include_path_specified_ (false),
+        default_prereq_type_ (),
+        default_prereq_type_specified_ (false)
+      {
+      }
+
+      bool depdb_dep_options::
+      parse (int& argc,
+             char** argv,
+             bool erase,
+             ::build2::build::script::cli::unknown_mode opt,
+             ::build2::build::script::cli::unknown_mode arg)
+      {
+        ::build2::build::script::cli::argv_scanner s (argc, argv, erase);
+        bool r = _parse (s, opt, arg);
+        return r;
+      }
+
+      bool depdb_dep_options::
+      parse (int start,
+             int& argc,
+             char** argv,
+             bool erase,
+             ::build2::build::script::cli::unknown_mode opt,
+             ::build2::build::script::cli::unknown_mode arg)
+      {
+        ::build2::build::script::cli::argv_scanner s (start, argc, argv, erase);
+        bool r = _parse (s, opt, arg);
+        return r;
+      }
+
+      bool depdb_dep_options::
+      parse (int& argc,
+             char** argv,
+             int& end,
+             bool erase,
+             ::build2::build::script::cli::unknown_mode opt,
+             ::build2::build::script::cli::unknown_mode arg)
+      {
+        ::build2::build::script::cli::argv_scanner s (argc, argv, erase);
+        bool r = _parse (s, opt, arg);
+        end = s.end ();
+        return r;
+      }
+
+      bool depdb_dep_options::
+      parse (int start,
+             int& argc,
+             char** argv,
+             int& end,
+             bool erase,
+             ::build2::build::script::cli::unknown_mode opt,
+             ::build2::build::script::cli::unknown_mode arg)
+      {
+        ::build2::build::script::cli::argv_scanner s (start, argc, argv, erase);
+        bool r = _parse (s, opt, arg);
+        end = s.end ();
+        return r;
+      }
+
+      bool depdb_dep_options::
+      parse (::build2::build::script::cli::scanner& s,
+             ::build2::build::script::cli::unknown_mode opt,
+             ::build2::build::script::cli::unknown_mode arg)
+      {
+        bool r = _parse (s, opt, arg);
+        return r;
+      }
+
+      typedef
+      std::map<std::string, void (*) (depdb_dep_options&, ::build2::build::script::cli::scanner&)>
+      _cli_depdb_dep_options_map;
+
+      static _cli_depdb_dep_options_map _cli_depdb_dep_options_map_;
+
+      struct _cli_depdb_dep_options_map_init
+      {
+        _cli_depdb_dep_options_map_init ()
+        {
+          _cli_depdb_dep_options_map_["--file"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, path, &depdb_dep_options::file_,
+            &depdb_dep_options::file_specified_ >;
+          _cli_depdb_dep_options_map_["--format"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, string, &depdb_dep_options::format_,
+            &depdb_dep_options::format_specified_ >;
+          _cli_depdb_dep_options_map_["--what"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, string, &depdb_dep_options::what_,
+            &depdb_dep_options::what_specified_ >;
+          _cli_depdb_dep_options_map_["--include-path"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, dir_paths, &depdb_dep_options::include_path_,
+            &depdb_dep_options::include_path_specified_ >;
+          _cli_depdb_dep_options_map_["-I"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, dir_paths, &depdb_dep_options::include_path_,
+            &depdb_dep_options::include_path_specified_ >;
+          _cli_depdb_dep_options_map_["--default-prereq-type"] =
+          &::build2::build::script::cli::thunk< depdb_dep_options, string, &depdb_dep_options::default_prereq_type_,
+            &depdb_dep_options::default_prereq_type_specified_ >;
+        }
+      };
+
+      static _cli_depdb_dep_options_map_init _cli_depdb_dep_options_map_init_;
+
+      bool depdb_dep_options::
+      _parse (const char* o, ::build2::build::script::cli::scanner& s)
+      {
+        _cli_depdb_dep_options_map::const_iterator i (_cli_depdb_dep_options_map_.find (o));
+
+        if (i != _cli_depdb_dep_options_map_.end ())
+        {
+          (*(i->second)) (*this, s);
+          return true;
+        }
+
+        return false;
+      }
+
+      bool depdb_dep_options::
+      _parse (::build2::build::script::cli::scanner& s,
+              ::build2::build::script::cli::unknown_mode opt_mode,
+              ::build2::build::script::cli::unknown_mode arg_mode)
+      {
+        // Can't skip combined flags (--no-combined-flags).
+        //
+        assert (opt_mode != ::build2::build::script::cli::unknown_mode::skip);
+
+        bool r = false;
+        bool opt = true;
+
+        while (s.more ())
+        {
+          const char* o = s.peek ();
+
+          if (std::strcmp (o, "--") == 0)
+          {
+            opt = false;
+            s.skip ();
+            r = true;
+            continue;
+          }
+
+          if (opt)
+          {
+            if (_parse (o, s))
+            {
+              r = true;
+              continue;
+            }
+
+            if (std::strncmp (o, "-", 1) == 0 && o[1] != '\0')
+            {
+              // Handle combined option values.
+              //
+              std::string co;
+              if (const char* v = std::strchr (o, '='))
+              {
+                co.assign (o, 0, v - o);
+                ++v;
+
+                int ac (2);
+                char* av[] =
+                {
+                  const_cast<char*> (co.c_str ()),
+                  const_cast<char*> (v)
+                };
+
+                ::build2::build::script::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);
+
+                  s.next ();
+                  r = true;
+                  continue;
+                }
+                else
+                {
+                  // Set the unknown option and fall through.
+                  //
+                  o = co.c_str ();
+                }
+              }
+
+              // Handle combined flags.
+              //
+              char cf[3];
+              {
+                const char* p = o + 1;
+                for (; *p != '\0'; ++p)
+                {
+                  if (!((*p >= 'a' && *p <= 'z') ||
+                        (*p >= 'A' && *p <= 'Z') ||
+                        (*p >= '0' && *p <= '9')))
+                    break;
+                }
+
+                if (*p == '\0')
+                {
+                  for (p = o + 1; *p != '\0'; ++p)
+                  {
+                    std::strcpy (cf, "-");
+                    cf[1] = *p;
+                    cf[2] = '\0';
+
+                    int ac (1);
+                    char* av[] =
+                    {
+                      cf
+                    };
+
+                    ::build2::build::script::cli::argv_scanner ns (0, ac, av);
+
+                    if (!_parse (cf, ns))
+                      break;
+                  }
+
+                  if (*p == '\0')
+                  {
+                    // All handled.
+                    //
+                    s.next ();
+                    r = true;
+                    continue;
+                  }
+                  else
+                  {
+                    // Set the unknown option and fall through.
+                    //
+                    o = cf;
+                  }
+                }
+              }
+
+              switch (opt_mode)
+              {
+                case ::build2::build::script::cli::unknown_mode::skip:
+                {
+                  s.skip ();
+                  r = true;
+                  continue;
+                }
+                case ::build2::build::script::cli::unknown_mode::stop:
+                {
+                  break;
+                }
+                case ::build2::build::script::cli::unknown_mode::fail:
+                {
+                  throw ::build2::build::script::cli::unknown_option (o);
+                }
+              }
+
+              break;
+            }
+          }
+
+          switch (arg_mode)
+          {
+            case ::build2::build::script::cli::unknown_mode::skip:
+            {
+              s.skip ();
+              r = true;
+              continue;
+            }
+            case ::build2::build::script::cli::unknown_mode::stop:
+            {
+              break;
+            }
+            case ::build2::build::script::cli::unknown_mode::fail:
+            {
+              throw ::build2::build::script::cli::unknown_argument (o);
+            }
+          }
+
+          break;
+        }
+
+        return r;
+      }
+    }
+  }
+}
+
+// Begin epilogue.
+//
+//
+// End epilogue.
+