#include "support/filetools.h"
#include "support/lstrings.h"
-#include <ostream>
#include <string>
using namespace std;
namespace lyx {
-namespace {
-
-enum CmdDefTags {
- BN_DEFFILE,
- BN_DEFINE
-};
-
-LexerKeyword cmdDefTags[] = {
- { "\\def_file", BN_DEFFILE },
- { "\\define", BN_DEFINE }
-};
-
-}
-
-
bool CmdDef::read(string const & def_file)
{
- Lexer lexrc(cmdDefTags);
- if (lyxerr.debugging(Debug::PARSER))
- lexrc.printTable(lyxerr);
+ enum {
+ BN_DEFFILE,
+ BN_DEFINE
+ };
+
+ LexerKeyword cmdDefTags[] = {
+ { "\\def_file", BN_DEFFILE },
+ { "\\define", BN_DEFINE }
+ };
+ Lexer lex(cmdDefTags);
FileName const tmp(i18nLibFileSearch("commands", def_file, "def"));
- lexrc.setFile(tmp);
- if (!lexrc.isOK()) {
- lyxerr << "CmdDef::read: cannot open def file:"
- << tmp << endl;
+ lex.setContext("CmdDef::read");
+ lex.setFile(tmp);
+ if (!lex.isOK()) {
+ LYXERR0( "CmdDef::read: cannot open def file:" << tmp);
return false;
}
bool error = false;
- while (lexrc.isOK()) {
- switch (lexrc.lex()) {
+ while (lex.isOK()) {
+ switch (lex.lex()) {
case Lexer::LEX_UNDEF:
- lexrc.printError("Unknown tag `$$Token'");
+ lex.printError("Unknown tag");
error = true;
continue;
case Lexer::LEX_FEOF:
{
string name, def;
- if (lexrc.next()) {
- name = lexrc.getString();
+ if (lex.next()) {
+ name = lex.getString();
} else {
- lexrc.printError("BN_DEFINE: Missing command name");
+ lex.printError("BN_DEFINE: Missing command name");
error = true;
break;
}
- if (lexrc.next(true)) {
- def = lexrc.getString();
+ if (lex.next(true)) {
+ def = lex.getString();
} else {
- lexrc.printError("BN_DEFINE: missing command definition");
+ lex.printError("BN_DEFINE: missing command definition");
error = true;
break;
}
newCmdDefResult e = newCmdDef(name, def);
switch (e) {
case CmdDefNameEmpty:
- lexrc.printError("BN_DEFINE: Command name is empty");
+ lex.printError("BN_DEFINE: Command name is empty");
error = true;
break;
case CmdDefExists:
- lexrc.printError("BN_DEFINE: Command `" + name + "' already defined");
+ lex.printError("BN_DEFINE: Command `" + name + "' already defined");
error = true;
break;
case CmdDefInvalid:
- lexrc.printError("BN_DEFINE: Command definition for `" + name + "' is not valid");
+ lex.printError("BN_DEFINE: Command definition for `" + name + "' is not valid");
error = true;
break;
case CmdDefOk:
break;
}
case BN_DEFFILE:
- if (lexrc.next()) {
- string const tmp(lexrc.getString());
+ if (lex.next()) {
+ string const tmp = lex.getString();
error |= !read(tmp);
} else {
- lexrc.printError("BN_DEFFILE: Missing file name");
+ lex.printError("BN_DEFFILE: Missing file name");
error = true;
break;
}
if (error)
- lyxerr << "CmdDef::read: error while reading def file:"
- << tmp << endl;
+ LYXERR0("CmdDef::read: error while reading def file:" << tmp);
return !error;
}
void CmdDef::release(string const & name)
{
string const name2 = trim(name);
-
lockSet.erase(name2);
}
+
CmdDef::newCmdDefResult CmdDef::newCmdDef(string const & name,
string const & def)
{
return CmdDefExists;
FuncRequest func = lyxaction.lookupFunc(def);
- if (func.action == LFUN_NOACTION ||
- func.action == LFUN_UNKNOWN_ACTION) {
+ if (func.action() == LFUN_NOACTION
+ || func.action() == LFUN_UNKNOWN_ACTION) {
return CmdDefInvalid;
}