From 443293aaf09eca7c3b88d621d056c4effee2c248 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 10 May 2012 17:54:18 +0200
Subject: Implement option class inheritance

For now multiple, non-virtual inheritance is supported. An option class
can now also be declared abstract using the class c = 0 {...}; syntax.
New option, --exclude-base, controls whether base class information is
present in usage and documentation.
---
 cli/options.ixx | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'cli/options.ixx')

diff --git a/cli/options.ixx b/cli/options.ixx
index f2072fe..05c9f9a 100644
--- a/cli/options.ixx
+++ b/cli/options.ixx
@@ -141,8 +141,12 @@ namespace cli
                      bool erase)
   : argv_scanner (argc, argv, erase),
     option_ (option),
+    options_ (&option_info_),
+    options_count_ (1),
     skip_ (false)
   {
+    option_info_.option = option_.c_str ();
+    option_info_.search_func = 0;
   }
 
   inline argv_file_scanner::
@@ -153,6 +157,37 @@ namespace cli
                      bool erase)
   : argv_scanner (start, argc, argv, erase),
     option_ (option),
+    options_ (&option_info_),
+    options_count_ (1),
+    skip_ (false)
+  {
+    option_info_.option = option_.c_str ();
+    option_info_.search_func = 0;
+  }
+
+  inline argv_file_scanner::
+  argv_file_scanner (int& argc,
+                     char** argv,
+                     const option_info* options,
+                     std::size_t options_count,
+                     bool erase)
+  : argv_scanner (argc, argv, erase),
+    options_ (options),
+    options_count_ (options_count),
+    skip_ (false)
+  {
+  }
+
+  inline argv_file_scanner::
+  argv_file_scanner (int start,
+                     int& argc,
+                     char** argv,
+                     const option_info* options,
+                     std::size_t options_count,
+                     bool erase)
+  : argv_scanner (start, argc, argv, erase),
+    options_ (options),
+    options_count_ (options_count),
     skip_ (false)
   {
   }
@@ -233,6 +268,12 @@ option_length () const
   return this->option_length_;
 }
 
+inline const bool& options::
+exclude_base () const
+{
+  return this->exclude_base_;
+}
+
 inline const std::string& options::
 cli_namespace () const
 {
-- 
cgit v1.1