X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FConsole%2FOverloadedCommand.hh;h=bb80f2332eef138fc2d8d276b521e7dd62d2f535;hb=a22f6d21df6c911d65f76d7731bcf92b1906bb09;hp=ee9bde99f8e48381f11eb9773666e50e188a5f79;hpb=6dde929083c59044ae60be57c42415becd4ff08c;p=senf.git diff --git a/Utils/Console/OverloadedCommand.hh b/Utils/Console/OverloadedCommand.hh index ee9bde9..bb80f23 100644 --- a/Utils/Console/OverloadedCommand.hh +++ b/Utils/Console/OverloadedCommand.hh @@ -69,13 +69,13 @@ namespace console { virtual ~CommandOverload(); - void execute(std::ostream & os, ParseCommandInfo const & command); + void execute(boost::any & rv, std::ostream & os, ParseCommandInfo const & command); ///< Call the overload /**< If the \a arguments are not acceptable for this overload, a SyntaxErrorException must be thrown. Same as operator()() */ - void operator()(std::ostream & os, ParseCommandInfo const & command); + void operator()(boost::any & rv, std::ostream & os, ParseCommandInfo const & command); ///< Call the overload /**< If the \a arguments are not acceptable for this overload, a SyntaxErrorException must be thrown. @@ -120,7 +120,8 @@ namespace console { /**< This member must be implemented in the derived class to return the overloads documentation string. */ - virtual void v_execute(std::ostream & os, ParseCommandInfo const & command) const = 0; + virtual void v_execute(boost::any & rv, std::ostream & os, ParseCommandInfo const & command) + const = 0; ///< Execute the overload /**< This member must be implemented in the derived class o execute the overload. */ @@ -196,7 +197,8 @@ namespace console { OverloadedCommandNode(); virtual void v_help(std::ostream & output) const; - virtual void v_execute(std::ostream & output, ParseCommandInfo const & command) const; + virtual void v_execute(boost::any & rv, std::ostream & os, ParseCommandInfo const & command) + const; typedef std::vector Overloads; @@ -240,7 +242,8 @@ namespace console { virtual unsigned v_numArguments() const; virtual void v_argumentDoc(unsigned index, ArgumentDoc & doc) const; virtual std::string v_doc() const; - virtual void v_execute(std::ostream & os, ParseCommandInfo const & command) const; + virtual void v_execute(boost::any & rv, std::ostream & os, ParseCommandInfo const & command) + const; Function fn_; std::string doc_;