nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use function pointer for CommandParser::Command

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-01-17 14:16:58 -08:00
parent c6099d777d
commit 3a5fd7342d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CommandDialog.cc
View file

@ -167,8 +167,8 @@ void CommandDialog::tabComplete() {
return; return;
} }
FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::CreatorMap::const_iterator it = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::instance().creatorMap().begin(); FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator>::CreatorMap::const_iterator it = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator>::instance().creatorMap().begin();
const FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::CreatorMap::const_iterator it_end = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::instance().creatorMap().end(); const FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator>::CreatorMap::const_iterator it_end = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator>::instance().creatorMap().end();
vector<string> matches; vector<string> matches;
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ((*it).first.find(prefix) == 0) { if ((*it).first.find(prefix) == 0) {

16
src/FbTk/CommandParser.hh
View file

@ -32,7 +32,7 @@ namespace FbTk {
// helper for registering a function to parse arguments // helper for registering a function to parse arguments
#define REGISTER_COMMAND_PARSER(name, parser, type) \ #define REGISTER_COMMAND_PARSER(name, parser, type) \
namespace { \ namespace { \
static const bool p_register_command_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, parser); \ static const bool p_register_command_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &parser); \
} }
// include some basic Command<void> creators // include some basic Command<void> creators
@ -44,7 +44,7 @@ Command<Type> *CommandCreator(const string &name, const string &args,
#define REGISTER_COMMAND(name, classname, type) \ #define REGISTER_COMMAND(name, classname, type) \
namespace { \ namespace { \
static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, FbTk::CommandCreator<classname, type>); \ static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreator<classname, type>); \
} }
template <typename ClassName, typename Type> template <typename ClassName, typename Type>
@ -55,7 +55,7 @@ Command<Type> *CommandCreatorWithArgs(const string &name, const string &args,
#define REGISTER_COMMAND_WITH_ARGS(name, classname, type) \ #define REGISTER_COMMAND_WITH_ARGS(name, classname, type) \
namespace { \ namespace { \
static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, FbTk::CommandCreatorWithArgs<classname, type>); \ static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreatorWithArgs<classname, type>); \
} }
template <typename ClassName, typename Type> template <typename ClassName, typename Type>
@ -67,7 +67,7 @@ Command<Type> *UntrustedCommandCreator(const string &name, const string &args,
#define REGISTER_UNTRUSTED_COMMAND(name, classname, type) \ #define REGISTER_UNTRUSTED_COMMAND(name, classname, type) \
namespace { \ namespace { \
static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, FbTk::UntrustedCommandCreator<classname, type>); \ static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreator<classname, type>); \
} }
template <typename ClassName, typename Type> template <typename ClassName, typename Type>
@ -79,13 +79,13 @@ Command<Type> *UntrustedCommandCreatorWithArgs(const string &name,
#define REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(name, classname, type) \ #define REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(name, classname, type) \
namespace { \ namespace { \
static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, FbTk::UntrustedCommandCreatorWithArgs<classname, type>); \ static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreatorWithArgs<classname, type>); \
} }
template <typename Type> template <typename Type>
class CommandParser { class CommandParser {
public: public:
typedef Command<Type> *Creator(const string &, const string &, bool); typedef Command<Type> *(*Creator)(const string &, const string &, bool);
static CommandParser<Type> &instance() { static CommandParser<Type> &instance() {
static CommandParser<Type> s_instance; static CommandParser<Type> s_instance;
@ -95,7 +95,7 @@ public:
Command<Type> *parse(const string &name, const string &args, Command<Type> *parse(const string &name, const string &args,
bool trusted = true) const { bool trusted = true) const {
string lc = StringUtil::toLower(name); string lc = StringUtil::toLower(name);
Creator *creator = ObjectRegistry<Creator *>::instance().lookup(lc); Creator creator = ObjectRegistry<Creator>::instance().lookup(lc);
if (creator) if (creator)
return creator(lc, args, trusted); return creator(lc, args, trusted);
return 0; return 0;
@ -114,7 +114,7 @@ public:
bool registerCommand(string name, Creator creator) { bool registerCommand(string name, Creator creator) {
name = StringUtil::toLower(name); name = StringUtil::toLower(name);
return ObjectRegistry<Creator *>::instance().registerObject(name, return ObjectRegistry<Creator>::instance().registerObject(name,
creator); creator);
} }