From 3e10322425fa0a3cf6e125bc6f9d833b015cc9b5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 14 Sep 2010 10:52:55 +0200 Subject: Implement the --cli-namespace option --- cli/options.cxx | 101 ++++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 57 deletions(-) (limited to 'cli/options.cxx') diff --git a/cli/options.cxx b/cli/options.cxx index 1c46fd4..6a14702 100644 --- a/cli/options.cxx +++ b/cli/options.cxx @@ -425,7 +425,8 @@ namespace cli parse (std::vector& c, scanner& s) { X x; - parser::parse (x, s); + bool dummy; + parser::parse (x, dummy, s); c.push_back (x); } }; @@ -437,7 +438,8 @@ namespace cli parse (std::set& c, scanner& s) { X x; - parser::parse (x, s); + bool dummy; + parser::parse (x, dummy, s); c.insert (x); } }; @@ -530,6 +532,7 @@ options (int& argc, suppress_usage_ (), long_usage_ (), option_length_ (0), + cli_namespace_ ("::cli"), generate_cxx_ (), generate_man_ (), generate_html_ (), @@ -573,6 +576,7 @@ options (int start, suppress_usage_ (), long_usage_ (), option_length_ (0), + cli_namespace_ ("::cli"), generate_cxx_ (), generate_man_ (), generate_html_ (), @@ -616,6 +620,7 @@ options (int& argc, suppress_usage_ (), long_usage_ (), option_length_ (0), + cli_namespace_ ("::cli"), generate_cxx_ (), generate_man_ (), generate_html_ (), @@ -661,6 +666,7 @@ options (int start, suppress_usage_ (), long_usage_ (), option_length_ (0), + cli_namespace_ ("::cli"), generate_cxx_ (), generate_man_ (), generate_html_ (), @@ -702,6 +708,7 @@ options (::cli::scanner& s, suppress_usage_ (), long_usage_ (), option_length_ (0), + cli_namespace_ ("::cli"), generate_cxx_ (), generate_man_ (), generate_html_ (), @@ -730,91 +737,69 @@ options (::cli::scanner& s, void options:: print_usage (::std::ostream& os) { - os << "--help Print usage information and exit." << ::std::endl; + os << "--help Print usage information and exit." << ::std::endl; - os << "--version Print version and exit." << ::std::endl; + os << "--version Print version and exit." << ::std::endl; - os << "--output-dir|-o Write the generated files to instead of the" << ::std::endl - << " current directory." << ::std::endl; + os << "--output-dir|-o Write the generated files to instead of the current directory." << ::std::endl; - os << "--generate-modifier Generate option value modifiers in addition to" << ::std::endl - << " accessors." << ::std::endl; + os << "--generate-modifier Generate option value modifiers in addition to accessors." << ::std::endl; - os << "--generate-specifier Generate functions for determining whether the" << ::std::endl - << " option was specified on the command line." << ::std::endl; + os << "--generate-specifier Generate functions for determining whether the option was specified on the command line." << ::std::endl; - os << "--generate-file-scanner Generate the 'argv_file_scanner' implementation." << ::std::endl; + os << "--generate-file-scanner Generate the 'argv_file_scanner' implementation." << ::std::endl; - os << "--suppress-inline Generate all functions non-inline." << ::std::endl; + os << "--suppress-inline Generate all functions non-inline." << ::std::endl; - os << "--suppress-usage Suppress the generation of the usage printing code." << ::std::endl; + os << "--suppress-usage Suppress the generation of the usage printing code." << ::std::endl; - os << "--long-usage If no short documentation string is provided, use" << ::std::endl - << " the complete long documentation string in usage." << ::std::endl; + os << "--long-usage If no short documentation string is provided, use the complete long documentation string in usage." << ::std::endl; - os << "--option-length Indent option descriptions characters when" << ::std::endl - << " printing usage." << ::std::endl; + os << "--option-length Indent option descriptions characters when printing usage." << ::std::endl; - os << "--generate-cxx Generate C++ code." << ::std::endl; + os << "--cli-namespace Generate the CLI support types in the namespace ('cli' by default). The namespace can be nested, for example 'details::cli'. If the namespace is empty, then the support types are generated in the global namespace." << std::endl; - os << "--generate-man Generate documentation in the man page format." << ::std::endl; + os << "--generate-cxx Generate C++ code." << ::std::endl; - os << "--generate-html Generate documentation in the HTML format." << ::std::endl; + os << "--generate-man Generate documentation in the man page format." << ::std::endl; - os << "--man-prologue Insert the content of at the beginning of" << ::std::endl - << " the man page file." << ::std::endl; + os << "--generate-html Generate documentation in the HTML format." << ::std::endl; - os << "--man-epilogue Insert the content of at the end of the man" << ::std::endl - << " page file." << ::std::endl; + os << "--man-prologue Insert the content of at the beginning of the man page file." << ::std::endl; - os << "--html-prologue Insert the content of at the beginning of" << ::std::endl - << " the HTML file." << ::std::endl; + os << "--man-epilogue Insert the content of at the end of the man page file." << ::std::endl; - os << "--html-epilogue Insert the content of at the end of the HTML" << ::std::endl - << " file." << ::std::endl; + os << "--html-prologue Insert the content of at the beginning of the HTML file." << ::std::endl; - os << "--class Generate the man page or HTML documentation only" << ::std::endl - << " for the options class." << ::std::endl; + os << "--html-epilogue Insert the content of at the end of the HTML file." << ::std::endl; - os << "--stdout Write output to STDOUT instead of a file." << ::std::endl; + os << "--class Generate the man page or HTML documentation only for the options class." << ::std::endl; - os << "--hxx-suffix Use instead of the default '.hxx' to" << ::std::endl - << " construct the name of the generated header file." << ::std::endl; + os << "--stdout Write output to STDOUT instead of a file." << ::std::endl; - os << "--ixx-suffix Use instead of the default '.ixx' to" << ::std::endl - << " construct the name of the generated inline file." << ::std::endl; + os << "--hxx-suffix Use instead of the default '.hxx' to construct the name of the generated header file." << ::std::endl; - os << "--cxx-suffix Use instead of the default '.cxx' to" << ::std::endl - << " construct the name of the generated source file." << ::std::endl; + os << "--ixx-suffix Use instead of the default '.ixx' to construct the name of the generated inline file." << ::std::endl; - os << "--man-suffix Use instead of the default '.1' to" << ::std::endl - << " construct the name of the generated man page file." << ::std::endl; + os << "--cxx-suffix Use instead of the default '.cxx' to construct the name of the generated source file." << ::std::endl; - os << "--html-suffix Use instead of the default '.html' to" << ::std::endl - << " construct the name of the generated HTML file." << ::std::endl; + os << "--man-suffix Use instead of the default '.1' to construct the name of the generated man page file." << ::std::endl; - os << "--option-prefix Use instead of the default '-' as an" << ::std::endl - << " option prefix." << ::std::endl; + os << "--html-suffix Use instead of the default '.html' to construct the name of the generated HTML file." << ::std::endl; - os << "--option-separator Use instead of the default '--' as an" << ::std::endl - << " optional separator between options and arguments." << ::std::endl; + os << "--option-prefix Use instead of the default '-' as an option prefix." << ::std::endl; - os << "--include-with-brackets Use angle brackets (<>) instead of quotes (\"\") in" << ::std::endl - << " the generated '#include' directives." << ::std::endl; + os << "--option-separator Use instead of the default '--' as an optional separator between options and arguments." << ::std::endl; - os << "--include-prefix Add to the generated '#include' directive" << ::std::endl - << " paths." << ::std::endl; + os << "--include-with-brackets Use angle brackets (<>) instead of quotes (\"\") in the generated '#include' directives." << ::std::endl; - os << "--guard-prefix Add to the generated header inclusion" << ::std::endl - << " guards." << ::std::endl; + os << "--include-prefix Add to the generated '#include' directive paths." << ::std::endl; - os << "--reserved-name = Add with an optional replacement to" << ::std::endl - << " the list of names that should not be used as" << ::std::endl - << " identifiers." << ::std::endl; + os << "--guard-prefix Add to the generated header inclusion guards." << ::std::endl; - os << "--options-file Read additional options from with each" << ::std::endl - << " option appearing on a separate line optionally" << ::std::endl - << " followed by space and an option value." << ::std::endl; + os << "--reserved-name = Add with an optional replacement to the list of names that should not be used as identifiers." << ::std::endl; + + os << "--options-file Read additional options from with each option appearing on a separate line optionally followed by space and an option value." << ::std::endl; } typedef @@ -849,6 +834,8 @@ struct _cli_options_map_init &::cli::thunk< options, bool, &options::long_usage_ >; _cli_options_map_["--option-length"] = &::cli::thunk< options, std::size_t, &options::option_length_ >; + _cli_options_map_["--cli-namespace"] = + &::cli::thunk< options, std::string, &options::cli_namespace_ >; _cli_options_map_["--generate-cxx"] = &::cli::thunk< options, bool, &options::generate_cxx_ >; _cli_options_map_["--generate-man"] = -- cgit v1.1