X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=a5e83b356bed7e497f19011a28ccef8e6ddd4cc6;hb=ad91dd139c4d6665704b11d9bd34770c3b769543;hp=36d79a4cd5e6191d2d067311ee12d785dbe12f8f;hpb=9439b6e6e0cf950aafe8ce8d76d380c543110db7;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 36d79a4cd5..a5e83b356b 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -15,11 +15,11 @@
 
 #include "KeyMap.h"
 
-#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
@@ -117,36 +117,28 @@ void KeyMap::clear()
 }
 
 
-namespace {
-
-enum BindTags {
-	BN_BIND,
-	BN_BINDFILE,
-	BN_UNBIND,
-};
-
-keyword_item bindTags[] = {
-	{ "\\bind", BN_BIND },
-	{ "\\bind_file", BN_BINDFILE },
-	{ "\\unbind", BN_UNBIND },
-};
-
-}
-
-
 bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 {
-	const int bindCount = sizeof(bindTags) / sizeof(keyword_item);
-
-	Lexer lexrc(bindTags, bindCount);
+	enum {
+		BN_BIND,
+		BN_BINDFILE,
+		BN_UNBIND,
+	};
+
+	LexerKeyword bindTags[] = {
+		{ "\\bind",      BN_BIND },
+		{ "\\bind_file", BN_BINDFILE },
+		{ "\\unbind",    BN_UNBIND },
+	};
+
+	Lexer lexrc(bindTags);
 	if (lyxerr.debugging(Debug::PARSER))
 		lexrc.printTable(lyxerr);
 
-	FileName const tmp(i18nLibFileSearch("bind", bind_file, "bind"));
+	FileName const tmp = i18nLibFileSearch("bind", bind_file, "bind");
 	lexrc.setFile(tmp);
 	if (!lexrc.isOK()) {
-		lyxerr << "KeyMap::read: cannot open bind file:"
-		       << tmp << endl;
+		LYXERR0("KeyMap::read: cannot open bind file:" << tmp);
 		return false;
 	}
 
@@ -155,36 +147,33 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 	bool error = false;
 	while (lexrc.isOK()) {
 		switch (lexrc.lex()) {
+
 		case Lexer::LEX_UNDEF:
 			lexrc.printError("Unknown tag `$$Token'");
 			error = true;
 			continue;
+
 		case Lexer::LEX_FEOF:
 			continue;
-		case BN_BIND:
-		{
-			string seq, cmd;
 
-			if (lexrc.next()) {
-				seq = lexrc.getString();
-			} else {
+		case BN_BIND: {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_BIND: Missing key sequence");
 				error = true;
 				break;
 			}
+			string seq = lexrc.getString();
 
-			if (lexrc.next(true)) {
-				cmd = lexrc.getString();
-			} else {
+			if (!lexrc.next(true)) {
 				lexrc.printError("BN_BIND: missing command");
 				error = true;
 				break;
 			}
+			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func. action == LFUN_UNKNOWN_ACTION) {
-				lexrc.printError("BN_BIND: Unknown LyX"
-						 " function `$$Token'");
+			if (func.action == LFUN_UNKNOWN_ACTION) {
+				lexrc.printError("BN_BIND: Unknown LyX function `$$Token'");
 				error = true;
 				break;
 			}
@@ -192,28 +181,24 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 			bind(seq, func);
 			break;
 		}
-		case BN_UNBIND:
-		{
-			string seq, cmd;
 
-			if (lexrc.next()) {
-				seq = lexrc.getString();
-			} else {
+		case BN_UNBIND: {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_UNBIND: Missing key sequence");
 				error = true;
 				break;
 			}
+			string seq = lexrc.getString();
 
-			if (lexrc.next(true)) {
-				cmd = lexrc.getString();
-			} else {
+			if (!lexrc.next(true)) {
 				lexrc.printError("BN_UNBIND: missing command");
 				error = true;
 				break;
 			}
+			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func. action == LFUN_UNKNOWN_ACTION) {
+			if (func.action == LFUN_UNKNOWN_ACTION) {
 				lexrc.printError("BN_UNBIND: Unknown LyX"
 						 " function `$$Token'");
 				error = true;
@@ -226,23 +211,21 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 				unbind(seq, func);
 			break;
 		}
+
 		case BN_BINDFILE:
-			if (lexrc.next()) {
-				string const tmp(lexrc.getString());
-				error |= !read(tmp, unbind_map);
-			} else {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_BINDFILE: Missing file name");
 				error = true;
 				break;
-
 			}
+			string const tmp = lexrc.getString();
+			error |= !read(tmp, unbind_map);
 			break;
 		}
 	}
 
 	if (error)
-		lyxerr << "KeyMap::read: error while reading bind file:"
-		       << tmp << endl;
+		LYXERR0("KeyMap::read: error while reading bind file:" << tmp);
 	return !error;
 }
 
@@ -250,7 +233,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 {
 	ofstream os(bind_file.c_str(), 
-		append ? (ios::app | ios:: out): ios::out);
+		append ? (ios::app | ios::out) : ios::out);
 
 	if (!append)
 		os << "## This file is automatically generated by lyx\n"
@@ -261,7 +244,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 	BindingList::const_iterator it = list.begin();
 	BindingList::const_iterator it_end = list.end();
 	for (; it != it_end; ++it) {
-		kb_action action = it->request.action;
+		FuncCode action = it->request.action;
 		string arg = to_utf8(it->request.argument());
 
 		os << tag << " \""
@@ -403,7 +386,7 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 					remove = it;
 					if (it->table.get())
 						it->table.reset();
-					}
+				}
 			} else if (it->table.get()) {
 				it->table->unbind(seq, func, r + 1);
 				if (it->table->empty())
@@ -412,10 +395,8 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 			}
 		}
 	}
-	if (remove != end) {
+	if (remove != end)
 		table.erase(remove);
-		return;
-	}
 }
 
 
@@ -476,7 +457,7 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, int tag) const
 		LyXAction::const_func_iterator fit = lyxaction.func_begin();
 		LyXAction::const_func_iterator fit_end = lyxaction.func_end();
 		for (; fit != fit_end; ++fit) {
-			kb_action action = fit->second;
+			FuncCode action = fit->second;
 			bool has_action = false;
 			BindingList::const_iterator it = list.begin();
 			BindingList::const_iterator it_end = list.end();