diff options
| -rw-r--r-- | build2/b.cxx | 10 | ||||
| -rw-r--r-- | libbuild2/b-cmdline.cxx (renamed from libbuild2/cmdline.cxx) | 24 | ||||
| -rw-r--r-- | libbuild2/b-cmdline.hxx (renamed from libbuild2/cmdline.hxx) | 22 | ||||
| -rw-r--r-- | libbuild2/b-options.cxx | 242 | ||||
| -rw-r--r-- | libbuild2/b-options.hxx | 6 | ||||
| -rw-r--r-- | libbuild2/b-options.ixx | 102 | ||||
| -rw-r--r-- | libbuild2/b.cli | 2 |
7 files changed, 204 insertions, 204 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index b14da09..470aade 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -35,8 +35,8 @@ #include <libbuild2/parser.hxx> -#include <libbuild2/cmdline.hxx> #include <libbuild2/b-options.hxx> +#include <libbuild2/b-cmdline.hxx> // Build system modules. // @@ -72,7 +72,7 @@ namespace build2 class result_printer { public: - result_printer (const options& ops, + result_printer (const b_options& ops, const action_targets& tgs, json::stream_serializer& js) : ops_ (ops), tgs_ (tgs), json_serializer_ (js) {} @@ -87,7 +87,7 @@ namespace build2 print_json (); private: - const options ops_; + const b_options& ops_; const action_targets& tgs_; json::stream_serializer& json_serializer_; }; @@ -265,7 +265,7 @@ main (int argc, char* argv[]) init_process (); int r (0); - options ops; + b_options ops; scheduler sched; // Statistics. @@ -276,7 +276,7 @@ main (int argc, char* argv[]) { // Parse the command line. // - cmdline cmdl (parse_cmdline (trace, argc, argv, ops)); + b_cmdline cmdl (parse_b_cmdline (trace, argc, argv, ops)); // Handle --build2-metadata (see also buildfile). // diff --git a/libbuild2/cmdline.cxx b/libbuild2/b-cmdline.cxx index e022762..2e2deb8 100644 --- a/libbuild2/cmdline.cxx +++ b/libbuild2/b-cmdline.cxx @@ -1,7 +1,7 @@ -// file : libbuild2/cmdline.cxx -*- C++ -*- +// file : libbuild2/b-cmdline.cxx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#include <libbuild2/cmdline.hxx> +#include <libbuild2/b-cmdline.hxx> #include <limits> #include <cstring> // strcmp(), strchr() @@ -19,12 +19,12 @@ namespace cli = build2::build::cli; namespace build2 { - cmdline - parse_cmdline (tracer& trace, - int argc, char* argv[], - options& ops, - uint16_t def_verb, - size_t def_jobs) + b_cmdline + parse_b_cmdline (tracer& trace, + int argc, char* argv[], + b_options& ops, + uint16_t def_verb, + size_t def_jobs) { // Note that the diagnostics verbosity level can only be calculated after // default options are loaded and merged (see below). Thus, until then we @@ -41,7 +41,7 @@ namespace build2 return v; }; - cmdline r; + b_cmdline r; // We want to be able to specify options, vars, and buildspecs in any // order (it is really handy to just add -v at the end of the command @@ -290,8 +290,8 @@ namespace build2 // Load default options files. // - default_options<options> def_ops ( - load_default_options<options, + default_options<b_options> def_ops ( + load_default_options<b_options, cli::argv_file_scanner, cli::unknown_mode> ( nullopt /* sys_dir */, @@ -331,7 +331,7 @@ namespace build2 merge_default_arguments ( def_ops, r.cmd_vars, - [&verify_glb_ovr] (const default_options_entry<options>& e, + [&verify_glb_ovr] (const default_options_entry<b_options>& e, const strings&) { path_name fn (e.file); diff --git a/libbuild2/cmdline.hxx b/libbuild2/b-cmdline.hxx index 56e9510..c5c82fc 100644 --- a/libbuild2/cmdline.hxx +++ b/libbuild2/b-cmdline.hxx @@ -1,8 +1,8 @@ -// file : libbuild2/cmdline.hxx -*- C++ -*- +// file : libbuild2/b-cmdline.hxx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#ifndef LIBBUILD2_CMDLINE_HXX -#define LIBBUILD2_CMDLINE_HXX +#ifndef LIBBUILD2_B_CMDLINE_HXX +#define LIBBUILD2_B_CMDLINE_HXX #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> @@ -15,7 +15,7 @@ namespace build2 { - struct cmdline + struct b_cmdline { strings cmd_vars; string buildspec; @@ -33,12 +33,12 @@ namespace build2 bool fcache_compress = true; }; - LIBBUILD2_SYMEXPORT cmdline - parse_cmdline (tracer&, - int argc, char* argv[], - options&, - uint16_t default_verbosity = 1, - size_t default_jobs = 0); + LIBBUILD2_SYMEXPORT b_cmdline + parse_b_cmdline (tracer&, + int argc, char* argv[], + b_options&, + uint16_t default_verbosity = 1, + size_t default_jobs = 0); } -#endif // LIBBUILD2_CMDLINE_HXX +#endif // LIBBUILD2_B_CMDLINE_HXX diff --git a/libbuild2/b-options.cxx b/libbuild2/b-options.cxx index b3a330c..223233a 100644 --- a/libbuild2/b-options.cxx +++ b/libbuild2/b-options.cxx @@ -233,11 +233,11 @@ namespace build2 namespace build2 { - // options + // b_options // - options:: - options () + b_options:: + b_options () : build2_metadata_ (), build2_metadata_specified_ (false), v_ (), @@ -291,7 +291,7 @@ namespace build2 { } - bool options:: + bool b_options:: parse (int& argc, char** argv, bool erase, @@ -303,7 +303,7 @@ namespace build2 return r; } - bool options:: + bool b_options:: parse (int start, int& argc, char** argv, @@ -316,7 +316,7 @@ namespace build2 return r; } - bool options:: + bool b_options:: parse (int& argc, char** argv, int& end, @@ -330,7 +330,7 @@ namespace build2 return r; } - bool options:: + bool b_options:: parse (int start, int& argc, char** argv, @@ -345,7 +345,7 @@ namespace build2 return r; } - bool options:: + bool b_options:: parse (::build2::build::cli::scanner& s, ::build2::build::cli::unknown_mode opt, ::build2::build::cli::unknown_mode arg) @@ -354,8 +354,8 @@ namespace build2 return r; } - void options:: - merge (const options& a) + void b_options:: + merge (const b_options& a) { CLI_POTENTIALLY_UNUSED (a); @@ -580,7 +580,7 @@ namespace build2 } } - ::build2::build::cli::usage_para options:: + ::build2::build::cli::usage_para b_options:: print_usage (::std::ostream& os, ::build2::build::cli::usage_para p) { CLI_POTENTIALLY_UNUSED (os); @@ -888,125 +888,125 @@ namespace build2 } typedef - std::map<std::string, void (*) (options&, ::build2::build::cli::scanner&)> - _cli_options_map; + std::map<std::string, void (*) (b_options&, ::build2::build::cli::scanner&)> + _cli_b_options_map; - static _cli_options_map _cli_options_map_; + static _cli_b_options_map _cli_b_options_map_; - struct _cli_options_map_init + struct _cli_b_options_map_init { - _cli_options_map_init () + _cli_b_options_map_init () { - _cli_options_map_["--build2-metadata"] = - &::build2::build::cli::thunk< options, uint64_t, &options::build2_metadata_, - &options::build2_metadata_specified_ >; - _cli_options_map_["-v"] = - &::build2::build::cli::thunk< options, bool, &options::v_ >; - _cli_options_map_["-V"] = - &::build2::build::cli::thunk< options, bool, &options::V_ >; - _cli_options_map_["--quiet"] = - &::build2::build::cli::thunk< options, bool, &options::quiet_ >; - _cli_options_map_["-q"] = - &::build2::build::cli::thunk< options, bool, &options::quiet_ >; - _cli_options_map_["--silent"] = - &::build2::build::cli::thunk< options, bool, &options::silent_ >; - _cli_options_map_["--verbose"] = - &::build2::build::cli::thunk< options, uint16_t, &options::verbose_, - &options::verbose_specified_ >; - _cli_options_map_["--stat"] = - &::build2::build::cli::thunk< options, bool, &options::stat_ >; - _cli_options_map_["--dump"] = - &::build2::build::cli::thunk< options, std::set<string>, &options::dump_, - &options::dump_specified_ >; - _cli_options_map_["--progress"] = - &::build2::build::cli::thunk< options, bool, &options::progress_ >; - _cli_options_map_["--no-progress"] = - &::build2::build::cli::thunk< options, bool, &options::no_progress_ >; - _cli_options_map_["--jobs"] = - &::build2::build::cli::thunk< options, size_t, &options::jobs_, - &options::jobs_specified_ >; - _cli_options_map_["-j"] = - &::build2::build::cli::thunk< options, size_t, &options::jobs_, - &options::jobs_specified_ >; - _cli_options_map_["--max-jobs"] = - &::build2::build::cli::thunk< options, size_t, &options::max_jobs_, - &options::max_jobs_specified_ >; - _cli_options_map_["-J"] = - &::build2::build::cli::thunk< options, size_t, &options::max_jobs_, - &options::max_jobs_specified_ >; - _cli_options_map_["--queue-depth"] = - &::build2::build::cli::thunk< options, size_t, &options::queue_depth_, - &options::queue_depth_specified_ >; - _cli_options_map_["-Q"] = - &::build2::build::cli::thunk< options, size_t, &options::queue_depth_, - &options::queue_depth_specified_ >; - _cli_options_map_["--file-cache"] = - &::build2::build::cli::thunk< options, string, &options::file_cache_, - &options::file_cache_specified_ >; - _cli_options_map_["--max-stack"] = - &::build2::build::cli::thunk< options, size_t, &options::max_stack_, - &options::max_stack_specified_ >; - _cli_options_map_["--serial-stop"] = - &::build2::build::cli::thunk< options, bool, &options::serial_stop_ >; - _cli_options_map_["-s"] = - &::build2::build::cli::thunk< options, bool, &options::serial_stop_ >; - _cli_options_map_["--dry-run"] = - &::build2::build::cli::thunk< options, bool, &options::dry_run_ >; - _cli_options_map_["-n"] = - &::build2::build::cli::thunk< options, bool, &options::dry_run_ >; - _cli_options_map_["--match-only"] = - &::build2::build::cli::thunk< options, bool, &options::match_only_ >; - _cli_options_map_["--no-external-modules"] = - &::build2::build::cli::thunk< options, bool, &options::no_external_modules_ >; - _cli_options_map_["--structured-result"] = - &::build2::build::cli::thunk< options, structured_result_format, &options::structured_result_, - &options::structured_result_specified_ >; - _cli_options_map_["--mtime-check"] = - &::build2::build::cli::thunk< options, bool, &options::mtime_check_ >; - _cli_options_map_["--no-mtime-check"] = - &::build2::build::cli::thunk< options, bool, &options::no_mtime_check_ >; - _cli_options_map_["--no-column"] = - &::build2::build::cli::thunk< options, bool, &options::no_column_ >; - _cli_options_map_["--no-line"] = - &::build2::build::cli::thunk< options, bool, &options::no_line_ >; - _cli_options_map_["--buildfile"] = - &::build2::build::cli::thunk< options, path, &options::buildfile_, - &options::buildfile_specified_ >; - _cli_options_map_["--config-guess"] = - &::build2::build::cli::thunk< options, path, &options::config_guess_, - &options::config_guess_specified_ >; - _cli_options_map_["--config-sub"] = - &::build2::build::cli::thunk< options, path, &options::config_sub_, - &options::config_sub_specified_ >; - _cli_options_map_["--pager"] = - &::build2::build::cli::thunk< options, string, &options::pager_, - &options::pager_specified_ >; - _cli_options_map_["--pager-option"] = - &::build2::build::cli::thunk< options, strings, &options::pager_option_, - &options::pager_option_specified_ >; - _cli_options_map_["--options-file"] = - &::build2::build::cli::thunk< options, string, &options::options_file_, - &options::options_file_specified_ >; - _cli_options_map_["--default-options"] = - &::build2::build::cli::thunk< options, dir_path, &options::default_options_, - &options::default_options_specified_ >; - _cli_options_map_["--no-default-options"] = - &::build2::build::cli::thunk< options, bool, &options::no_default_options_ >; - _cli_options_map_["--help"] = - &::build2::build::cli::thunk< options, bool, &options::help_ >; - _cli_options_map_["--version"] = - &::build2::build::cli::thunk< options, bool, &options::version_ >; + _cli_b_options_map_["--build2-metadata"] = + &::build2::build::cli::thunk< b_options, uint64_t, &b_options::build2_metadata_, + &b_options::build2_metadata_specified_ >; + _cli_b_options_map_["-v"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::v_ >; + _cli_b_options_map_["-V"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::V_ >; + _cli_b_options_map_["--quiet"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::quiet_ >; + _cli_b_options_map_["-q"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::quiet_ >; + _cli_b_options_map_["--silent"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::silent_ >; + _cli_b_options_map_["--verbose"] = + &::build2::build::cli::thunk< b_options, uint16_t, &b_options::verbose_, + &b_options::verbose_specified_ >; + _cli_b_options_map_["--stat"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::stat_ >; + _cli_b_options_map_["--dump"] = + &::build2::build::cli::thunk< b_options, std::set<string>, &b_options::dump_, + &b_options::dump_specified_ >; + _cli_b_options_map_["--progress"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::progress_ >; + _cli_b_options_map_["--no-progress"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_progress_ >; + _cli_b_options_map_["--jobs"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::jobs_, + &b_options::jobs_specified_ >; + _cli_b_options_map_["-j"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::jobs_, + &b_options::jobs_specified_ >; + _cli_b_options_map_["--max-jobs"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::max_jobs_, + &b_options::max_jobs_specified_ >; + _cli_b_options_map_["-J"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::max_jobs_, + &b_options::max_jobs_specified_ >; + _cli_b_options_map_["--queue-depth"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::queue_depth_, + &b_options::queue_depth_specified_ >; + _cli_b_options_map_["-Q"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::queue_depth_, + &b_options::queue_depth_specified_ >; + _cli_b_options_map_["--file-cache"] = + &::build2::build::cli::thunk< b_options, string, &b_options::file_cache_, + &b_options::file_cache_specified_ >; + _cli_b_options_map_["--max-stack"] = + &::build2::build::cli::thunk< b_options, size_t, &b_options::max_stack_, + &b_options::max_stack_specified_ >; + _cli_b_options_map_["--serial-stop"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::serial_stop_ >; + _cli_b_options_map_["-s"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::serial_stop_ >; + _cli_b_options_map_["--dry-run"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::dry_run_ >; + _cli_b_options_map_["-n"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::dry_run_ >; + _cli_b_options_map_["--match-only"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::match_only_ >; + _cli_b_options_map_["--no-external-modules"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_external_modules_ >; + _cli_b_options_map_["--structured-result"] = + &::build2::build::cli::thunk< b_options, structured_result_format, &b_options::structured_result_, + &b_options::structured_result_specified_ >; + _cli_b_options_map_["--mtime-check"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::mtime_check_ >; + _cli_b_options_map_["--no-mtime-check"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_mtime_check_ >; + _cli_b_options_map_["--no-column"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_column_ >; + _cli_b_options_map_["--no-line"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_line_ >; + _cli_b_options_map_["--buildfile"] = + &::build2::build::cli::thunk< b_options, path, &b_options::buildfile_, + &b_options::buildfile_specified_ >; + _cli_b_options_map_["--config-guess"] = + &::build2::build::cli::thunk< b_options, path, &b_options::config_guess_, + &b_options::config_guess_specified_ >; + _cli_b_options_map_["--config-sub"] = + &::build2::build::cli::thunk< b_options, path, &b_options::config_sub_, + &b_options::config_sub_specified_ >; + _cli_b_options_map_["--pager"] = + &::build2::build::cli::thunk< b_options, string, &b_options::pager_, + &b_options::pager_specified_ >; + _cli_b_options_map_["--pager-option"] = + &::build2::build::cli::thunk< b_options, strings, &b_options::pager_option_, + &b_options::pager_option_specified_ >; + _cli_b_options_map_["--options-file"] = + &::build2::build::cli::thunk< b_options, string, &b_options::options_file_, + &b_options::options_file_specified_ >; + _cli_b_options_map_["--default-options"] = + &::build2::build::cli::thunk< b_options, dir_path, &b_options::default_options_, + &b_options::default_options_specified_ >; + _cli_b_options_map_["--no-default-options"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::no_default_options_ >; + _cli_b_options_map_["--help"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::help_ >; + _cli_b_options_map_["--version"] = + &::build2::build::cli::thunk< b_options, bool, &b_options::version_ >; } }; - static _cli_options_map_init _cli_options_map_init_; + static _cli_b_options_map_init _cli_b_options_map_init_; - bool options:: + bool b_options:: _parse (const char* o, ::build2::build::cli::scanner& s) { - _cli_options_map::const_iterator i (_cli_options_map_.find (o)); + _cli_b_options_map::const_iterator i (_cli_b_options_map_.find (o)); - if (i != _cli_options_map_.end ()) + if (i != _cli_b_options_map_.end ()) { (*(i->second)) (*this, s); return true; @@ -1015,7 +1015,7 @@ namespace build2 return false; } - bool options:: + bool b_options:: _parse (::build2::build::cli::scanner& s, ::build2::build::cli::unknown_mode opt_mode, ::build2::build::cli::unknown_mode arg_mode) @@ -1209,7 +1209,7 @@ namespace build2 << "\033[1m'--'\033[0m separator. To avoid treating an argument that contains \033[1m'='\033[0m as a variable," << ::std::endl << "add the second \033[1m'--'\033[0m separator." << ::std::endl; - p = ::build2::options::print_usage (os, ::build2::build::cli::usage_para::text); + p = ::build2::b_options::print_usage (os, ::build2::build::cli::usage_para::text); if (p != ::build2::build::cli::usage_para::none) os << ::std::endl; diff --git a/libbuild2/b-options.hxx b/libbuild2/b-options.hxx index ffdecf5..d8d85d3 100644 --- a/libbuild2/b-options.hxx +++ b/libbuild2/b-options.hxx @@ -19,10 +19,10 @@ namespace build2 { - class LIBBUILD2_SYMEXPORT options + class LIBBUILD2_SYMEXPORT b_options { public: - options (); + b_options (); // Return true if anything has been parsed. // @@ -67,7 +67,7 @@ namespace build2 // them as if they appeared after options in this instance. // void - merge (const options&); + merge (const b_options&); // Option accessors. // diff --git a/libbuild2/b-options.ixx b/libbuild2/b-options.ixx index 8030ef3..b7944ba 100644 --- a/libbuild2/b-options.ixx +++ b/libbuild2/b-options.ixx @@ -11,304 +11,304 @@ namespace build2 { - // options + // b_options // - inline const uint64_t& options:: + inline const uint64_t& b_options:: build2_metadata () const { return this->build2_metadata_; } - inline bool options:: + inline bool b_options:: build2_metadata_specified () const { return this->build2_metadata_specified_; } - inline const bool& options:: + inline const bool& b_options:: v () const { return this->v_; } - inline const bool& options:: + inline const bool& b_options:: V () const { return this->V_; } - inline const bool& options:: + inline const bool& b_options:: quiet () const { return this->quiet_; } - inline const bool& options:: + inline const bool& b_options:: silent () const { return this->silent_; } - inline const uint16_t& options:: + inline const uint16_t& b_options:: verbose () const { return this->verbose_; } - inline bool options:: + inline bool b_options:: verbose_specified () const { return this->verbose_specified_; } - inline const bool& options:: + inline const bool& b_options:: stat () const { return this->stat_; } - inline const std::set<string>& options:: + inline const std::set<string>& b_options:: dump () const { return this->dump_; } - inline bool options:: + inline bool b_options:: dump_specified () const { return this->dump_specified_; } - inline const bool& options:: + inline const bool& b_options:: progress () const { return this->progress_; } - inline const bool& options:: + inline const bool& b_options:: no_progress () const { return this->no_progress_; } - inline const size_t& options:: + inline const size_t& b_options:: jobs () const { return this->jobs_; } - inline bool options:: + inline bool b_options:: jobs_specified () const { return this->jobs_specified_; } - inline const size_t& options:: + inline const size_t& b_options:: max_jobs () const { return this->max_jobs_; } - inline bool options:: + inline bool b_options:: max_jobs_specified () const { return this->max_jobs_specified_; } - inline const size_t& options:: + inline const size_t& b_options:: queue_depth () const { return this->queue_depth_; } - inline bool options:: + inline bool b_options:: queue_depth_specified () const { return this->queue_depth_specified_; } - inline const string& options:: + inline const string& b_options:: file_cache () const { return this->file_cache_; } - inline bool options:: + inline bool b_options:: file_cache_specified () const { return this->file_cache_specified_; } - inline const size_t& options:: + inline const size_t& b_options:: max_stack () const { return this->max_stack_; } - inline bool options:: + inline bool b_options:: max_stack_specified () const { return this->max_stack_specified_; } - inline const bool& options:: + inline const bool& b_options:: serial_stop () const { return this->serial_stop_; } - inline const bool& options:: + inline const bool& b_options:: dry_run () const { return this->dry_run_; } - inline const bool& options:: + inline const bool& b_options:: match_only () const { return this->match_only_; } - inline const bool& options:: + inline const bool& b_options:: no_external_modules () const { return this->no_external_modules_; } - inline const structured_result_format& options:: + inline const structured_result_format& b_options:: structured_result () const { return this->structured_result_; } - inline bool options:: + inline bool b_options:: structured_result_specified () const { return this->structured_result_specified_; } - inline const bool& options:: + inline const bool& b_options:: mtime_check () const { return this->mtime_check_; } - inline const bool& options:: + inline const bool& b_options:: no_mtime_check () const { return this->no_mtime_check_; } - inline const bool& options:: + inline const bool& b_options:: no_column () const { return this->no_column_; } - inline const bool& options:: + inline const bool& b_options:: no_line () const { return this->no_line_; } - inline const path& options:: + inline const path& b_options:: buildfile () const { return this->buildfile_; } - inline bool options:: + inline bool b_options:: buildfile_specified () const { return this->buildfile_specified_; } - inline const path& options:: + inline const path& b_options:: config_guess () const { return this->config_guess_; } - inline bool options:: + inline bool b_options:: config_guess_specified () const { return this->config_guess_specified_; } - inline const path& options:: + inline const path& b_options:: config_sub () const { return this->config_sub_; } - inline bool options:: + inline bool b_options:: config_sub_specified () const { return this->config_sub_specified_; } - inline const string& options:: + inline const string& b_options:: pager () const { return this->pager_; } - inline bool options:: + inline bool b_options:: pager_specified () const { return this->pager_specified_; } - inline const strings& options:: + inline const strings& b_options:: pager_option () const { return this->pager_option_; } - inline bool options:: + inline bool b_options:: pager_option_specified () const { return this->pager_option_specified_; } - inline const string& options:: + inline const string& b_options:: options_file () const { return this->options_file_; } - inline bool options:: + inline bool b_options:: options_file_specified () const { return this->options_file_specified_; } - inline const dir_path& options:: + inline const dir_path& b_options:: default_options () const { return this->default_options_; } - inline bool options:: + inline bool b_options:: default_options_specified () const { return this->default_options_specified_; } - inline const bool& options:: + inline const bool& b_options:: no_default_options () const { return this->no_default_options_; } - inline const bool& options:: + inline const bool& b_options:: help () const { return this->help_; } - inline const bool& options:: + inline const bool& b_options:: version () const { return this->version_; diff --git a/libbuild2/b.cli b/libbuild2/b.cli index b1f8a5f..3ae6e0b 100644 --- a/libbuild2/b.cli +++ b/libbuild2/b.cli @@ -477,7 +477,7 @@ namespace build2 " } - class options + class b_options { "\h#options|OPTIONS|" |