From 59e7ca8e3c83b7fee8282c043107acf4d7c3bab1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 31 Mar 2020 12:40:54 +0200
Subject: Regenerate options parsing code

---
 odb/options.cxx | 36 +++++++++++++++++++++++++++++++-----
 odb/options.hxx | 25 ++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/odb/options.cxx b/odb/options.cxx
index 829a96a..fedf8c5 100644
--- a/odb/options.cxx
+++ b/odb/options.cxx
@@ -215,6 +215,7 @@ namespace cli
   // argv_file_scanner
   //
   int argv_file_scanner::zero_argc_ = 0;
+  std::string argv_file_scanner::empty_string_;
 
   bool argv_file_scanner::
   more ()
@@ -288,7 +289,25 @@ namespace cli
     if (!more ())
       throw eos_reached ();
 
-    return args_.empty () ? base::peek () : args_.front ().c_str ();
+    return args_.empty () ? base::peek () : args_.front ().value.c_str ();
+  }
+
+  const std::string& argv_file_scanner::
+  peek_file ()
+  {
+    if (!more ())
+      throw eos_reached ();
+
+    return args_.empty () ? empty_string_ : *args_.front ().file;
+  }
+
+  std::size_t argv_file_scanner::
+  peek_line ()
+  {
+    if (!more ())
+      throw eos_reached ();
+
+    return args_.empty () ? 0 : args_.front ().line;
   }
 
   const char* argv_file_scanner::
@@ -301,7 +320,7 @@ namespace cli
       return base::next ();
     else
     {
-      hold_[i_ == 0 ? ++i_ : --i_].swap (args_.front ());
+      hold_[i_ == 0 ? ++i_ : --i_].swap (args_.front ().value);
       args_.pop_front ();
       return hold_[i_].c_str ();
     }
@@ -339,7 +358,12 @@ namespace cli
     if (!is.is_open ())
       throw file_io_failure (file);
 
-    while (!is.eof ())
+    files_.push_back (file);
+
+    arg a;
+    a.file = &*files_.rbegin ();
+
+    for (a.line = 1; !is.eof (); ++a.line)
     {
       string line;
       getline (is, line);
@@ -446,10 +470,12 @@ namespace cli
           continue;
         }
 
-        args_.push_back (s1);
+        a.value = s1;
+        args_.push_back (a);
       }
 
-      args_.push_back (s2);
+      a.value = s2;
+      args_.push_back (a);
     }
   }
 
diff --git a/odb/options.hxx b/odb/options.hxx
index 1615570..241c8a9 100644
--- a/odb/options.hxx
+++ b/odb/options.hxx
@@ -12,6 +12,7 @@
 //
 // End prologue.
 
+#include <list>
 #include <deque>
 #include <map>
 #include <vector>
@@ -341,6 +342,19 @@ namespace cli
     virtual void
     skip ();
 
+    // Return the file path if the peeked at argument came from a file and
+    // the empty string otherwise. The reference is guaranteed to be valid
+    // till the end of the scanner lifetime.
+    //
+    const std::string&
+    peek_file ();
+
+    // Return the 1-based line number if the peeked at argument came from
+    // a file and zero otherwise.
+    //
+    std::size_t
+    peek_line ();
+
     private:
     const option_info*
     find (const char*) const;
@@ -355,7 +369,15 @@ namespace cli
     const option_info* options_;
     std::size_t options_count_;
 
-    std::deque<std::string> args_;
+    struct arg
+    {
+      std::string value;
+      const std::string* file;
+      std::size_t line;
+    };
+
+    std::deque<arg> args_;
+    std::list<std::string> files_;
 
     // Circular buffer of two arguments.
     //
@@ -365,6 +387,7 @@ namespace cli
     bool skip_;
 
     static int zero_argc_;
+    static std::string empty_string_;
   };
 
   typedef std::vector<std::string> option_names;
-- 
cgit v1.1