#include <config.h>
#include "lyxlex_pimpl.h"
+
#include "debug.h"
-#include "support/lyxalgo.h"
#include "support/filetools.h"
+#include "support/lyxalgo.h"
#include "support/lstrings.h"
+#include <functional>
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::getFormatFromContents;
+using lyx::support::makeDisplayPath;
+using lyx::support::split;
+using lyx::support::subst;
using std::endl;
using std::getline;
using std::lower_bound;
using std::sort;
-
+using std::string;
using std::ios;
using std::istream;
using std::ostream;
-// namespace {
-struct compare_tags {
+namespace {
+
+class compare_tags
+ : public std::binary_function<keyword_item, keyword_item, bool> {
+public:
// used by lower_bound, sort and sorted
- inline
- int operator()(keyword_item const & a, keyword_item const & b) const {
+ bool operator()(keyword_item const & a, keyword_item 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;
}
};
-// } // end of anon namespace
+
+} // end of anon namespace
LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
- : is(&fb__), table(tab), no_items(num),
+ : is(&fb_), table(tab), no_items(num),
status(0), lineno(0), commentChar('#')
{
verifyTable();
{
string const tmpmsg = subst(message, "$$Token", getString());
lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
- << " of file " << MakeDisplayPath(name) << ']' << endl;
+ << " of file " << makeDisplayPath(name) << ']' << endl;
}
bool LyXLex::Pimpl::setFile(string const & filename)
{
-
// Check the format of the file.
- string const format = getExtFromContents(filename);
+ string const format = getFormatFromContents(filename);
if (format == "gzip" || format == "zip" || format == "compress") {
- lyxerr << "lyxlex: compressed" << endl;
+ lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
+#ifdef USE_COMPRESSION
// The check only outputs a debug message, because it triggers
// a bug in compaq cxx 6.2, where is_open() returns 'true' for
// a fresh new filebuf. (JMarc)
- if (gz__.is_open() || is.tellg() > 0)
+ if (gz_.is_open() || istream::off_type(is.tellg()) > -1)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
- gz__.open(filename.c_str(), ios::in);
- is.rdbuf(&gz__);
+ gz_.open(filename.c_str(), ios::in);
+ is.rdbuf(&gz_);
name = filename;
lineno = 0;
- return gz__.is_open() && is.good();
+ return gz_.is_open() && is.good();
+#else
+ return false;
+#endif
} else {
- lyxerr << "lyxlex: UNcompressed" << endl;
+ lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;
// The check only outputs a debug message, because it triggers
// a bug in compaq cxx 6.2, where is_open() returns 'true' for
// a fresh new filebuf. (JMarc)
- if (fb__.is_open() || is.tellg() > 0)
+ if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
- fb__.open(filename.c_str(), ios::in);
- is.rdbuf(&fb__);
+ fb_.open(filename.c_str(), ios::in);
+ is.rdbuf(&fb_);
name = filename;
lineno = 0;
- return fb__.is_open() && is.good();
+ return fb_.is_open() && is.good();
}
}
void LyXLex::Pimpl::setStream(istream & i)
{
- if (fb__.is_open() || is.tellg() > 0)
+ if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setStream: "
"file or stream already set." << endl;
is.rdbuf(i.rdbuf());