diff options
Diffstat (limited to 'xsd/xsd/pregenerated')
-rw-r--r-- | xsd/xsd/pregenerated/xsd/cxx/options.cxx | 64 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/cxx/options.hxx | 8 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/cxx/options.ixx | 12 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/cxx/parser/options.cxx | 50 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/cxx/tree/options.cxx | 50 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/options.cxx | 85 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/options.hxx | 30 | ||||
-rw-r--r-- | xsd/xsd/pregenerated/xsd/options.ixx | 6 |
8 files changed, 275 insertions, 30 deletions
diff --git a/xsd/xsd/pregenerated/xsd/cxx/options.cxx b/xsd/xsd/pregenerated/xsd/cxx/options.cxx index f4d3fa7..9eea3a9 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/options.cxx +++ b/xsd/xsd/pregenerated/xsd/cxx/options.cxx @@ -184,6 +184,56 @@ namespace cli } }; + template <typename K, typename V, typename C> + struct parser<std::multimap<K, V, C> > + { + static void + parse (std::multimap<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.insert (typename std::multimap<K, V, C>::value_type (k, v)); + } + else + throw missing_value (o); + + xs = true; + } + }; + template <typename X, typename T, T X::*M> void thunk (X& x, scanner& s) @@ -216,7 +266,7 @@ namespace CXX options:: options () - : std_ (cxx_version::cxx98), + : std_ (cxx_version::cxx11), std_specified_ (false), char_type_ ("char"), char_type_specified_ (false), @@ -311,6 +361,8 @@ namespace CXX dep_target_specified_ (false), dep_suffix_ (".d"), dep_suffix_specified_ (false), + dep_file_ (), + dep_file_specified_ (false), dep_regex_ (), dep_regex_specified_ (false) { @@ -477,8 +529,11 @@ namespace CXX os << "--dep-target <target> Change the target of the dependency rule." << ::std::endl; - os << "--dep-suffix <suffix> Use the provided <suffix> instead of the default" << ::std::endl - << " .d to construct the name of the dependency file." << ::std::endl; + os << "--dep-suffix <suffix> Use <suffix> instead of the default .d to" << ::std::endl + << " construct the name of the dependency file." << ::std::endl; + + os << "--dep-file <path> Use <path> as the generated dependency file path" << ::std::endl + << " instead of deriving it from the input file name." << ::std::endl; os << "--dep-regex <regex> Use the provided expression to construct the name" << ::std::endl << " of the dependency file." << ::std::endl; @@ -646,6 +701,9 @@ namespace CXX _cli_options_map_["--dep-suffix"] = &::cli::thunk< options, NarrowString, &options::dep_suffix_, &options::dep_suffix_specified_ >; + _cli_options_map_["--dep-file"] = + &::cli::thunk< options, NarrowString, &options::dep_file_, + &options::dep_file_specified_ >; _cli_options_map_["--dep-regex"] = &::cli::thunk< options, NarrowString, &options::dep_regex_, &options::dep_regex_specified_ >; diff --git a/xsd/xsd/pregenerated/xsd/cxx/options.hxx b/xsd/xsd/pregenerated/xsd/cxx/options.hxx index b01027a..085aa4c 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/options.hxx +++ b/xsd/xsd/pregenerated/xsd/cxx/options.hxx @@ -313,6 +313,12 @@ namespace CXX dep_suffix_specified () const; const NarrowString& + dep_file () const; + + bool + dep_file_specified () const; + + const NarrowString& dep_regex () const; bool @@ -428,6 +434,8 @@ namespace CXX bool dep_target_specified_; NarrowString dep_suffix_; bool dep_suffix_specified_; + NarrowString dep_file_; + bool dep_file_specified_; NarrowString dep_regex_; bool dep_regex_specified_; }; diff --git a/xsd/xsd/pregenerated/xsd/cxx/options.ixx b/xsd/xsd/pregenerated/xsd/cxx/options.ixx index e8ba2fb..8266e31 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/options.ixx +++ b/xsd/xsd/pregenerated/xsd/cxx/options.ixx @@ -585,6 +585,18 @@ namespace CXX } inline const NarrowString& options:: + dep_file () const + { + return this->dep_file_; + } + + inline bool options:: + dep_file_specified () const + { + return this->dep_file_specified_; + } + + inline const NarrowString& options:: dep_regex () const { return this->dep_regex_; diff --git a/xsd/xsd/pregenerated/xsd/cxx/parser/options.cxx b/xsd/xsd/pregenerated/xsd/cxx/parser/options.cxx index 04cb7ae..60667ac 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/parser/options.cxx +++ b/xsd/xsd/pregenerated/xsd/cxx/parser/options.cxx @@ -184,6 +184,56 @@ namespace cli } }; + template <typename K, typename V, typename C> + struct parser<std::multimap<K, V, C> > + { + static void + parse (std::multimap<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.insert (typename std::multimap<K, V, C>::value_type (k, v)); + } + else + throw missing_value (o); + + xs = true; + } + }; + template <typename X, typename T, T X::*M> void thunk (X& x, scanner& s) diff --git a/xsd/xsd/pregenerated/xsd/cxx/tree/options.cxx b/xsd/xsd/pregenerated/xsd/cxx/tree/options.cxx index 60ddeb0..17214c1 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/tree/options.cxx +++ b/xsd/xsd/pregenerated/xsd/cxx/tree/options.cxx @@ -184,6 +184,56 @@ namespace cli } }; + template <typename K, typename V, typename C> + struct parser<std::multimap<K, V, C> > + { + static void + parse (std::multimap<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.insert (typename std::multimap<K, V, C>::value_type (k, v)); + } + else + throw missing_value (o); + + xs = true; + } + }; + template <typename X, typename T, T X::*M> void thunk (X& x, scanner& s) diff --git a/xsd/xsd/pregenerated/xsd/options.cxx b/xsd/xsd/pregenerated/xsd/options.cxx index 34b0ff5..3022ec4 100644 --- a/xsd/xsd/pregenerated/xsd/options.cxx +++ b/xsd/xsd/pregenerated/xsd/options.cxx @@ -27,7 +27,7 @@ namespace cli // unknown_option // unknown_option:: - ~unknown_option () throw () + ~unknown_option () noexcept { } @@ -38,7 +38,7 @@ namespace cli } const char* unknown_option:: - what () const throw () + what () const noexcept { return "unknown option"; } @@ -46,7 +46,7 @@ namespace cli // unknown_argument // unknown_argument:: - ~unknown_argument () throw () + ~unknown_argument () noexcept { } @@ -57,7 +57,7 @@ namespace cli } const char* unknown_argument:: - what () const throw () + what () const noexcept { return "unknown argument"; } @@ -65,7 +65,7 @@ namespace cli // missing_value // missing_value:: - ~missing_value () throw () + ~missing_value () noexcept { } @@ -76,7 +76,7 @@ namespace cli } const char* missing_value:: - what () const throw () + what () const noexcept { return "missing option value"; } @@ -84,7 +84,7 @@ namespace cli // invalid_value // invalid_value:: - ~invalid_value () throw () + ~invalid_value () noexcept { } @@ -99,7 +99,7 @@ namespace cli } const char* invalid_value:: - what () const throw () + what () const noexcept { return "invalid option value"; } @@ -113,7 +113,7 @@ namespace cli } const char* eos_reached:: - what () const throw () + what () const noexcept { return "end of argument stream reached"; } @@ -121,7 +121,7 @@ namespace cli // file_io_failure // file_io_failure:: - ~file_io_failure () throw () + ~file_io_failure () noexcept { } @@ -132,7 +132,7 @@ namespace cli } const char* file_io_failure:: - what () const throw () + what () const noexcept { return "unable to open file or read failure"; } @@ -140,7 +140,7 @@ namespace cli // unmatched_quote // unmatched_quote:: - ~unmatched_quote () throw () + ~unmatched_quote () noexcept { } @@ -151,7 +151,7 @@ namespace cli } const char* unmatched_quote:: - what () const throw () + what () const noexcept { return "unmatched quote"; } @@ -677,6 +677,56 @@ namespace cli } }; + template <typename K, typename V, typename C> + struct parser<std::multimap<K, V, C> > + { + static void + parse (std::multimap<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.insert (typename std::multimap<K, V, C>::value_type (k, v)); + } + else + throw missing_value (o); + + xs = true; + } + }; + template <typename X, typename T, T X::*M> void thunk (X& x, scanner& s) @@ -1046,6 +1096,7 @@ options () fat_type_file_ (), file_list_ (), file_list_specified_ (false), + file_list_only_ (), file_list_prologue_ (), file_list_prologue_specified_ (false), file_list_epilogue_ (), @@ -1125,7 +1176,11 @@ print_usage (::std::wostream& os, ::cli::usage_para p) << " into type files instead of schema files when the" << ::std::endl << " --type-file-regex option is specified." << ::std::endl; - os << "--file-list <file> Write a list of generated C++ files to <file>." << ::std::endl; + os << "--file-list <file> Write a list of generated C++ files to <file> or" << ::std::endl + << " to stdout if <file> is -." << ::std::endl; + + os << "--file-list-only Only write the list of C++ files that would be" << ::std::endl + << " generated without actually generating them." << ::std::endl; os << "--file-list-prologue <text> Insert <text> at the beginning of the file list." << ::std::endl; @@ -1201,6 +1256,8 @@ struct _cli_options_map_init _cli_options_map_["--file-list"] = &::cli::thunk< options, NarrowString, &options::file_list_, &options::file_list_specified_ >; + _cli_options_map_["--file-list-only"] = + &::cli::thunk< options, &options::file_list_only_ >; _cli_options_map_["--file-list-prologue"] = &::cli::thunk< options, NarrowString, &options::file_list_prologue_, &options::file_list_prologue_specified_ >; diff --git a/xsd/xsd/pregenerated/xsd/options.hxx b/xsd/xsd/pregenerated/xsd/options.hxx index bdeaa7e..0f4383c 100644 --- a/xsd/xsd/pregenerated/xsd/options.hxx +++ b/xsd/xsd/pregenerated/xsd/options.hxx @@ -88,7 +88,7 @@ namespace cli { public: virtual - ~unknown_option () throw (); + ~unknown_option () noexcept; unknown_option (const std::string& option); @@ -99,7 +99,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string option_; @@ -109,7 +109,7 @@ namespace cli { public: virtual - ~unknown_argument () throw (); + ~unknown_argument () noexcept; unknown_argument (const std::string& argument); @@ -120,7 +120,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string argument_; @@ -130,7 +130,7 @@ namespace cli { public: virtual - ~missing_value () throw (); + ~missing_value () noexcept; missing_value (const std::string& option); @@ -141,7 +141,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string option_; @@ -151,7 +151,7 @@ namespace cli { public: virtual - ~invalid_value () throw (); + ~invalid_value () noexcept; invalid_value (const std::string& option, const std::string& value, @@ -170,7 +170,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string option_; @@ -185,14 +185,14 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; }; class file_io_failure: public exception { public: virtual - ~file_io_failure () throw (); + ~file_io_failure () noexcept; file_io_failure (const std::string& file); @@ -203,7 +203,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string file_; @@ -213,7 +213,7 @@ namespace cli { public: virtual - ~unmatched_quote () throw (); + ~unmatched_quote () noexcept; unmatched_quote (const std::string& argument); @@ -224,7 +224,7 @@ namespace cli print (::std::wostream&) const; virtual const char* - what () const throw (); + what () const noexcept; private: std::string argument_; @@ -608,6 +608,9 @@ class options bool file_list_specified () const; + const bool& + file_list_only () const; + const NarrowString& file_list_prologue () const; @@ -678,6 +681,7 @@ class options bool fat_type_file_; NarrowString file_list_; bool file_list_specified_; + bool file_list_only_; NarrowString file_list_prologue_; bool file_list_prologue_specified_; NarrowString file_list_epilogue_; diff --git a/xsd/xsd/pregenerated/xsd/options.ixx b/xsd/xsd/pregenerated/xsd/options.ixx index e905544..d87e59c 100644 --- a/xsd/xsd/pregenerated/xsd/options.ixx +++ b/xsd/xsd/pregenerated/xsd/options.ixx @@ -495,6 +495,12 @@ file_list_specified () const return this->file_list_specified_; } +inline const bool& options:: +file_list_only () const +{ + return this->file_list_only_; +} + inline const NarrowString& options:: file_list_prologue () const { |