1 files changed, 71 insertions, 14 deletions

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_ >;