X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.cpp;h=6f5da00d2bbebcd1e6a7a3be8f330ff2cb60d427;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=781aa52d15c5784e830a7bd4fde90549e0d979da;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 781aa52d15..6f5da00d2b 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -15,15 +15,14 @@
 
 #include "Lexer.h"
 
-#include "support/debug.h"
-
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gzstream.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/types.h"
-#include "support/unicode.h"
 
 #include <boost/noncopyable.hpp>
 
@@ -51,21 +50,21 @@ public:
 	///
 	Pimpl(keyword_item * tab, int num);
 	///
-	std::string const getString() const;
+	string const getString() const;
 	///
 	docstring const getDocString() const;
 	///
-	void printError(std::string const & message) const;
+	void printError(string const & message) const;
 	///
-	void printTable(std::ostream & os);
+	void printTable(ostream & os);
 	///
 	void pushTable(keyword_item * tab, int num);
 	///
 	void popTable();
 	///
-	bool setFile(support::FileName const & filename);
+	bool setFile(FileName const & filename);
 	///
-	void setStream(std::istream & i);
+	void setStream(istream & i);
 	///
 	void setCommentChar(char c);
 	///
@@ -81,42 +80,42 @@ public:
 	/// test if there is a pushed token or the stream is ok
 	bool inputAvailable();
 	///
-	void pushToken(std::string const &);
+	void pushToken(string const &);
 	/// fb_ is only used to open files, the stream is accessed through is.
-	std::filebuf fb_;
+	filebuf fb_;
 
 	/// gz_ is only used to open files, the stream is accessed through is.
 	gz::gzstreambuf gz_;
 
 	/// the stream that we use.
-	std::istream is;
+	istream is;
 	///
-	std::string name;
+	string name;
 	///
 	keyword_item * table;
 	///
 	int no_items;
 	///
-	std::string buff;
+	string buff;
 	///
 	int status;
 	///
 	int lineno;
 	///
-	std::string pushTok;
+	string pushTok;
 	///
 	char commentChar;
 private:
 	///
 	void verifyTable();
 	///
-	class pushed_table {
+	class PushedTable {
 	public:
 		///
-		pushed_table()
+		PushedTable()
 			: table_elem(0), table_siz(0) {}
 		///
-		pushed_table(keyword_item * ki, int siz)
+		PushedTable(keyword_item * ki, int siz)
 			: table_elem(ki), table_siz(siz) {}
 		///
 		keyword_item * table_elem;
@@ -124,15 +123,15 @@ private:
 		int table_siz;
 	};
 	///
-	std::stack<pushed_table> pushed;
+	stack<PushedTable> pushed;
 };
 
 
 
 namespace {
 
-class compare_tags
-	: public std::binary_function<keyword_item, keyword_item, bool> {
+class CompareTags
+	: public binary_function<keyword_item, keyword_item, bool> {
 public:
 	// used by lower_bound, sort and sorted
 	bool operator()(keyword_item const & a, keyword_item const & b) const
@@ -190,14 +189,14 @@ void Lexer::Pimpl::verifyTable()
 {
 	// Check if the table is sorted and if not, sort it.
 	if (table
-	    && !lyx::sorted(table, table + no_items, compare_tags())) {
+	    && !lyx::sorted(table, table + no_items, CompareTags())) {
 		lyxerr << "The table passed to Lexer is not sorted!\n"
 		       << "Tell the developers to fix it!" << endl;
 		// We sort it anyway to avoid problems.
 		lyxerr << "\nUnsorted:" << endl;
 		printTable(lyxerr);
 
-		sort(table, table + no_items, compare_tags());
+		sort(table, table + no_items, CompareTags());
 		lyxerr << "\nSorted:" << endl;
 		printTable(lyxerr);
 	}
@@ -206,7 +205,7 @@ void Lexer::Pimpl::verifyTable()
 
 void Lexer::Pimpl::pushTable(keyword_item * tab, int num)
 {
-	pushed_table tmppu(table, no_items);
+	PushedTable tmppu(table, no_items);
 	pushed.push(tmppu);
 
 	table = tab;
@@ -223,7 +222,7 @@ void Lexer::Pimpl::popTable()
 		return;
 	}
 
-	pushed_table tmp = pushed.top();
+	PushedTable tmp = pushed.top();
 	pushed.pop();
 	table = tmp.table_elem;
 	no_items = tmp.table_siz;
@@ -485,7 +484,7 @@ int Lexer::Pimpl::search_kw(char const * const tag) const
 	keyword_item search_tag = { tag, 0 };
 	keyword_item * res =
 		lower_bound(table, table + no_items,
-			    search_tag, compare_tags());
+			    search_tag, CompareTags());
 	// use the compare_ascii_no_case instead of compare_no_case,
 	// because in turkish, 'i' is not the lowercase version of 'I',
 	// and thus turkish locale breaks parsing of tags.
@@ -573,7 +572,8 @@ bool Lexer::Pimpl::nextToken()
 				} while (c >= ' ' && c != '\\' && is);
 			}
 
-			if (c == '\\') is.putback(c); // put it back
+			if (c == '\\')
+				is.putback(c); // put it back
 			status = LEX_TOKEN;
 		}
 
@@ -669,7 +669,7 @@ void Lexer::printError(string const & message) const
 }
 
 
-bool Lexer::setFile(support::FileName const & filename)
+bool Lexer::setFile(FileName const & filename)
 {
 	return pimpl_->setFile(filename);
 }
@@ -840,7 +840,7 @@ void Lexer::pushToken(string const & pt)
 
 Lexer::operator void const *() const
 {
-	// This behaviour is NOT the same as the std::streams which would
+	// This behaviour is NOT the same as the streams which would
 	// use fail() here. However, our implementation of getString() et al.
 	// can cause the eof() and fail() bits to be set, even though we
 	// haven't tried to read 'em.
@@ -854,7 +854,7 @@ bool Lexer::operator!() const
 }
 
 
-Lexer & Lexer::operator>>(std::string & s)
+Lexer & Lexer::operator>>(string & s)
 {
 	if (isOK()) {
 		next();
@@ -929,7 +929,7 @@ Lexer & Lexer::operator>>(bool & s)
 /// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
 string const Lexer::quoteString(string const & arg)
 {
-	std::ostringstream os;
+	ostringstream os;
 	os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
 	return os.str();
 }