1 files changed, 94 insertions, 10 deletions

diff --git a/libbuild2/b-options.ixx b/libbuild2/b-options.ixx
index b7944ba..34b0d39 100644
--- a/libbuild2/b-options.ixx
+++ b/libbuild2/b-options.ixx
@@ -68,28 +68,28 @@ namespace build2
     return this->stat_;
   }
 
-  inline const std::set<string>& b_options::
-  dump () const
+  inline const bool& b_options::
+  progress () const
   {
-    return this->dump_;
+    return this->progress_;
   }
 
-  inline bool b_options::
-  dump_specified () const
+  inline const bool& b_options::
+  no_progress () const
   {
-    return this->dump_specified_;
+    return this->no_progress_;
   }
 
   inline const bool& b_options::
-  progress () const
+  diag_color () const
   {
-    return this->progress_;
+    return this->diag_color_;
   }
 
   inline const bool& b_options::
-  no_progress () const
+  no_diag_color () const
   {
-    return this->no_progress_;
+    return this->no_diag_color_;
   }
 
   inline const size_t& b_options::
@@ -165,12 +165,24 @@ namespace build2
   }
 
   inline const bool& b_options::
+  no_diag_buffer () const
+  {
+    return this->no_diag_buffer_;
+  }
+
+  inline const bool& b_options::
   match_only () const
   {
     return this->match_only_;
   }
 
   inline const bool& b_options::
+  load_only () const
+  {
+    return this->load_only_;
+  }
+
+  inline const bool& b_options::
   no_external_modules () const
   {
     return this->no_external_modules_;
@@ -200,6 +212,78 @@ namespace build2
     return this->no_mtime_check_;
   }
 
+  inline const strings& b_options::
+  dump () const
+  {
+    return this->dump_;
+  }
+
+  inline bool b_options::
+  dump_specified () const
+  {
+    return this->dump_specified_;
+  }
+
+  inline const string& b_options::
+  dump_format () const
+  {
+    return this->dump_format_;
+  }
+
+  inline bool b_options::
+  dump_format_specified () const
+  {
+    return this->dump_format_specified_;
+  }
+
+  inline const dir_paths& b_options::
+  dump_scope () const
+  {
+    return this->dump_scope_;
+  }
+
+  inline bool b_options::
+  dump_scope_specified () const
+  {
+    return this->dump_scope_specified_;
+  }
+
+  inline const vector<pair<name, optional<name>>>& b_options::
+  dump_target () const
+  {
+    return this->dump_target_;
+  }
+
+  inline bool b_options::
+  dump_target_specified () const
+  {
+    return this->dump_target_specified_;
+  }
+
+  inline const vector<name>& b_options::
+  trace_match () const
+  {
+    return this->trace_match_;
+  }
+
+  inline bool b_options::
+  trace_match_specified () const
+  {
+    return this->trace_match_specified_;
+  }
+
+  inline const vector<name>& b_options::
+  trace_execute () const
+  {
+    return this->trace_execute_;
+  }
+
+  inline bool b_options::
+  trace_execute_specified () const
+  {
+    return this->trace_execute_specified_;
+  }
+
   inline const bool& b_options::
   no_column () const
   {