Scanner-based parsing with support for element erasing

Also implement argv_file_scanner which provides support for reading command
line arguments from the argv array as well as files specified with command
line options. New examples: file. New tests: ctor, erase, file.

1 files changed, 10 insertions, 4 deletions

diff --git a/cli/options.ixx b/cli/options.ixx
index 6fcc80f..74d7b15 100644
--- a/cli/options.ixx
+++ b/cli/options.ixx
@@ -87,14 +87,14 @@ namespace cli
   // argv_scanner
   //
   inline argv_scanner::
-  argv_scanner (int argc, char** argv)
-  : i_ (1), argc_ (argc), argv_ (argv)
+  argv_scanner (int& argc, char** argv, bool erase)
+  : i_ (1), argc_ (argc), argv_ (argv), erase_ (erase)
   {
   }
 
   inline argv_scanner::
-  argv_scanner (int start, int argc, char** argv)
-  : i_ (start), argc_ (argc), argv_ (argv)
+  argv_scanner (int start, int& argc, char** argv, bool erase)
+  : i_ (start), argc_ (argc), argv_ (argv), erase_ (erase)
   {
   }
 
@@ -133,6 +133,12 @@ generate_modifier () const
 }
 
 inline const bool& options::
+generate_file_scanner () const
+{
+  return this->generate_file_scanner_;
+}
+
+inline const bool& options::
 suppress_inline () const
 {
   return this->suppress_inline_;