Check in all changes made so far toward 3.0.

1 files changed, 12 insertions, 33 deletions

diff --git a/option.h b/option.h
index 91838b99..778b16ba 100644
--- a/option.h
+++ b/option.h
@@ -2,20 +2,24 @@
 #define _OPTION_H
 
 #include <list>
+#include <map>
 #include <string>
 #include <exception>
 
+#include "xpath.h"
 #include "error.h"
 
-typedef void (*handler_t)(const char * arg);
+namespace ledger {
 
-struct option_t {
-  const char * long_opt;
-  char	       short_opt;
-  bool	       wants_arg;
-  handler_t    handler;
-  bool         handled;
-};
+bool process_option(const std::string& name, xml::xpath_t::scope_t * scope,
+		    const char * arg = NULL);
+
+void process_environment(const char ** envp, const std::string& tag,
+			 xml::xpath_t::scope_t * scope);
+
+void process_arguments(int argc, char ** argv, const bool anywhere,
+		       xml::xpath_t::scope_t * scope,
+		       std::list<std::string>& args);
 
 class option_error : public error {
  public:
@@ -23,31 +27,6 @@ class option_error : public error {
   virtual ~option_error() throw() {}
 };
 
-bool process_option(option_t * options, const std::string& opt,
-		    const char * arg = NULL);
-void process_arguments(option_t * options, int argc, char ** argv,
-		       const bool anywhere, std::list<std::string>& args);
-void process_environment(option_t * options, const char ** envp,
-			 const std::string& tag);
-
-namespace ledger {
-
-class config_t;
-class report_t;
-
-extern config_t * config;
-extern report_t * report;
-
-#define CONFIG_OPTIONS_SIZE 97
-extern option_t config_options[CONFIG_OPTIONS_SIZE];
-
-void option_help(std::ostream& out);
-
-#define OPT_BEGIN(tag, chars)			\
-    void opt_ ## tag(const char * optarg)
-
-#define OPT_END(tag)
-
 } // namespace ledger
 
 #endif // _OPTION_H