#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h"
-#include "support/types.h"
+#include <algorithm> // sort, lower_bound
#include <functional>
+#include <fstream>
#include <istream>
#include <stack>
#include <vector>
};
-
namespace {
-class CompareTags
- : public binary_function<LexerKeyword, LexerKeyword, bool> {
-public:
- // used by lower_bound, sort and sorted
- bool operator()(LexerKeyword const & a, LexerKeyword const & b) const
- {
- // we use the ascii version, because in turkish, 'i'
- // is not the lowercase version of 'I', and thus
- // turkish locale breaks parsing of tags.
- return compare_ascii_no_case(a.tag, b.tag) < 0;
- }
-};
+// used by lower_bound, sort and sorted
+bool compareTags(LexerKeyword const & a, LexerKeyword const & b)
+{
+ // we use the ascii version, because in turkish, 'i'
+ // is not the lowercase version of 'I', and thus
+ // turkish locale breaks parsing of tags.
+ return compare_ascii_no_case(a.tag, b.tag) < 0;
+}
} // namespace
+
Lexer::Pimpl::Pimpl(LexerKeyword * tab, int num)
: is(&fb_), table(tab), no_items(num),
status(0), lineno(0), commentChar('#')
{
// Check if the table is sorted and if not, sort it.
if (table
- && !lyx::sorted(table, table + no_items, CompareTags())) {
+ && !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, CompareTags());
+ sort(table, table + no_items, &compareTags);
lyxerr << "\nSorted:" << endl;
printTable(lyxerr);
}
LexerKeyword search_tag = { tag, 0 };
LexerKeyword * res =
lower_bound(table, table + no_items,
- search_tag, CompareTags());
+ 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.
}
-void Lexer::setContext(std::string const & str)
+void Lexer::setContext(std::string const & functionName)
{
- pimpl_->context = str;
+ pimpl_->context = functionName;
}