1 files changed, 35 insertions, 2 deletions

diff --git a/odb/options.cxx b/odb/options.cxx
index 9065abc..d5af128 100644
--- a/odb/options.cxx
+++ b/odb/options.cxx
@@ -16,6 +16,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <utility>
 #include <ostream>
 #include <sstream>
 #include <cstring>
@@ -197,6 +198,7 @@ namespace cli
       else
         ++i_;
 
+      ++start_position_;
       return r;
     }
     else
@@ -207,11 +209,20 @@ namespace cli
   skip ()
   {
     if (i_ < argc_)
+    {
       ++i_;
+      ++start_position_;
+    }
     else
       throw eos_reached ();
   }
 
+  std::size_t argv_scanner::
+  position ()
+  {
+    return start_position_;
+  }
+
   // argv_file_scanner
   //
   int argv_file_scanner::zero_argc_ = 0;
@@ -322,6 +333,7 @@ namespace cli
     {
       hold_[i_ == 0 ? ++i_ : --i_].swap (args_.front ().value);
       args_.pop_front ();
+      ++start_position_;
       return hold_[i_].c_str ();
     }
   }
@@ -335,7 +347,10 @@ namespace cli
     if (args_.empty ())
       return base::skip ();
     else
+    {
       args_.pop_front ();
+      ++start_position_;
+    }
   }
 
   const argv_file_scanner::option_info* argv_file_scanner::
@@ -348,6 +363,12 @@ namespace cli
     return 0;
   }
 
+  std::size_t argv_file_scanner::
+  position ()
+  {
+    return start_position_;
+  }
+
   void argv_file_scanner::
   load (const std::string& file)
   {
@@ -559,6 +580,17 @@ namespace cli
   };
 
   template <typename X>
+  struct parser<std::pair<X, std::size_t> >
+  {
+    static void
+    parse (std::pair<X, std::size_t>& x, bool& xs, scanner& s)
+    {
+      x.second = s.position ();
+      parser<X>::parse (x.first, xs, s);
+    }
+  };
+
+  template <typename X>
   struct parser<std::vector<X> >
   {
     static void
@@ -596,6 +628,7 @@ namespace cli
 
       if (s.more ())
       {
+        std::size_t pos (s.position ());
         std::string ov (s.next ());
         std::string::size_type p = ov.find ('=');
 
@@ -615,14 +648,14 @@ namespace cli
         if (!kstr.empty ())
         {
           av[1] = const_cast<char*> (kstr.c_str ());
-          argv_scanner s (0, ac, av);
+          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);
+          argv_scanner s (0, ac, av, false, pos);
           parser<V>::parse (v, dummy, s);
         }