From 76ab8cc083108c1407d7ce326821d3fbe9fbd2b9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 9 Feb 2009 00:02:40 -0400 Subject: Fixed an issue where --amount EXPR wasn't seeing that it had been "handled". --- src/option.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/option.h') diff --git a/src/option.h b/src/option.h index 00f9d8d7..50ba238d 100644 --- a/src/option.h +++ b/src/option.h @@ -127,10 +127,15 @@ public: value = value_t(); } + virtual void handler_thunk(call_scope_t& args) {} + virtual void handler(call_scope_t& args) { if (wants_arg) - value = args[0]; - handled = true; + on(args[0]); + else + on(); + + handler_thunk(args); } virtual value_t handler_wrapper(call_scope_t& args) { @@ -164,8 +169,8 @@ public: name ## _option_t() : option_t(#name), var(value) #define HELP(var) virtual void help(std::ostream& var) -#define DO() virtual void handler(call_scope_t&) -#define DO_(var) virtual void handler(call_scope_t& var) +#define DO() virtual void handler_thunk(call_scope_t&) +#define DO_(var) virtual void handler_thunk(call_scope_t& var) #define END(name) name ## _handler -- cgit v1.2.3