#include "CmdDef.h"
#include "LyXAction.h"
-#include "debug.h"
#include "Lexer.h"
+#include "support/debug.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-using std::endl;
-using std::string;
+#include <ostream>
+#include <string>
-namespace lyx {
-
-using support::FileName;
-using support::i18nLibFileSearch;
-using support::trim;
+using namespace std;
+using namespace lyx::support;
+namespace lyx {
namespace {
BN_DEFINE
};
-keyword_item cmdDefTags[] = {
+LexerKeyword cmdDefTags[] = {
{ "\\def_file", BN_DEFFILE },
{ "\\define", BN_DEFINE }
};
bool CmdDef::read(string const & def_file)
{
- const int cmdDefCount = sizeof(cmdDefTags) / sizeof(keyword_item);
-
- Lexer lexrc(cmdDefTags, cmdDefCount);
+ Lexer lexrc(cmdDefTags);
if (lyxerr.debugging(Debug::PARSER))
lexrc.printTable(lyxerr);
return false;
}
-// LYXERR(Debug::KBMAP) << "Reading def file:" << tmp << endl;
-
bool error = false;
while (lexrc.isOK()) {
switch (lexrc.lex()) {
newCmdDefResult e = newCmdDef(name, def);
switch (e) {
- case CmdDefNameEmpty:
- lexrc.printError("BN_DEFINE: Command name is empty");
- error = true;
- break;
- case CmdDefExists:
- lexrc.printError("BN_DEFINE: Command `" + name + "' already defined");
- error = true;
- break;
- case CmdDefInvalid:
- lexrc.printError("BN_DEFINE: Command definition for `" + name + "' is not valid");
- error = true;
+ case CmdDefNameEmpty:
+ lexrc.printError("BN_DEFINE: Command name is empty");
+ error = true;
+ break;
+ case CmdDefExists:
+ lexrc.printError("BN_DEFINE: Command `" + name + "' already defined");
+ error = true;
+ break;
+ case CmdDefInvalid:
+ lexrc.printError("BN_DEFINE: Command definition for `" + name + "' is not valid");
+ error = true;
+ break;
+ case CmdDefOk:
+ break;
}
break;
bool CmdDef::lock(string const & name, FuncRequest & func)
{
- if (cmdDefMap.empty())
- {
+ if (cmdDefMap.empty()) {
func = FuncRequest::unknown;
return false;
}
string const name2 = trim(name);
- CmdDefMap::const_iterator pos = cmdDefMap.find(name2);
-
- if (pos == cmdDefMap.end())
- {
- func = FuncRequest::unknown;
+ if (lockSet.find(name2) != lockSet.end()) {
+ func = FuncRequest::noaction;
return false;
}
- if (pos->second->locked)
- {
- func = FuncRequest::noaction;
+ CmdDefMap::const_iterator pos = cmdDefMap.find(name2);
+
+ if (pos == cmdDefMap.end()) {
+ func = FuncRequest::unknown;
return false;
}
- pos->second->locked = true;
- func = pos->second->func;
+ lockSet.insert(name2);
+ func = pos->second;
return true;
}
void CmdDef::release(string const & name)
{
- if (cmdDefMap.empty())
- return;
-
string const name2 = trim(name);
- CmdDefMap::const_iterator pos = cmdDefMap.find(name2);
-
- if (pos == cmdDefMap.end())
- return;
-
- pos->second->locked = false;
+ lockSet.erase(name2);
}
CmdDef::newCmdDefResult CmdDef::newCmdDef(string const & name,
return CmdDefInvalid;
}
- boost::shared_ptr<CmdDefInfo> info;
- info.reset(new CmdDefInfo(func));
- cmdDefMap[name2] = info;
+ cmdDefMap[name2] = func;
return CmdDefOk;
}