#include <functional>
-using lyx::support::compare_ascii_no_case;
-using lyx::support::getFormatFromContents;
-using lyx::support::makeDisplayPath;
-using lyx::support::split;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::FileName;
+using support::getFormatFromContents;
+using support::makeDisplayPath;
+using support::split;
+using support::subst;
using std::endl;
using std::getline;
string const LyXLex::Pimpl::getString() const
{
- return string(buff.begin(), buff.end());
+ return buff;
}
-lyx::docstring const LyXLex::Pimpl::getDocString() const
+docstring const LyXLex::Pimpl::getDocString() const
{
- std::vector<boost::uint32_t> res = utf8_to_ucs4(buff);
- lyx::docstring dstr(res.begin(), res.end());
- return dstr;
+ return from_utf8(buff);
}
{
string const tmpmsg = subst(message, "$$Token", getString());
lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
- << " of file " << makeDisplayPath(name) << ']' << endl;
+ << " of file " << to_utf8(makeDisplayPath(name)) << ']' << endl;
}
}
-bool LyXLex::Pimpl::setFile(string const & filename)
+bool LyXLex::Pimpl::setFile(FileName const & filename)
{
// Check the format of the file.
string const format = getFormatFromContents(filename);
if (format == "gzip" || format == "zip" || format == "compress") {
- lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
+ LYXERR(Debug::LYXLEX) << "lyxlex: compressed" << 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 (!gz_.empty() || istream::off_type(is.tellg()) > -1)
- lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
+ LYXERR(Debug::LYXLEX) << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
gz_.push(io::gzip_decompressor());
- gz_.push(io::file_source(filename));
+ gz_.push(io::file_source(filename.toFilesystemEncoding()));
is.rdbuf(&gz_);
- name = filename;
+ name = filename.absFilename();
lineno = 0;
return gz_.component<io::file_source>(1)->is_open() && is.good();
} else {
- lyxerr[Debug::LYXLEX] << "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() || istream::off_type(is.tellg()) > 0)
- lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
+ LYXERR(Debug::LYXLEX) << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
- fb_.open(filename.c_str(), ios::in);
+ fb_.open(filename.toFilesystemEncoding().c_str(), ios::in);
is.rdbuf(&fb_);
- name = filename;
+ name = filename.absFilename();
lineno = 0;
return fb_.is_open() && is.good();
}
void LyXLex::Pimpl::setStream(istream & i)
{
if (fb_.is_open() || istream::off_type(is.tellg()) > 0)
- lyxerr[Debug::LYXLEX] << "Error in LyXLex::setStream: "
+ LYXERR(Debug::LYXLEX) << "Error in LyXLex::setStream: "
"file or stream already set." << endl;
is.rdbuf(i.rdbuf());
lineno = 0;
// There can have been a whole line pushed so
// we extract the first word and leaves the rest
// in pushTok. (Lgb)
- if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
- string tmp;
- pushTok = split(pushTok, tmp, ' ');
- buff.assign(tmp.begin(), tmp.end());
- return true;
+ if (pushTok[0] == '\\' && pushTok.find(' ') != string::npos) {
+ buff.clear();
+ pushTok = split(pushTok, buff, ' ');
} else {
- buff.assign(pushTok.begin(), pushTok.end());
- pushTok.erase();
- return true;
+ buff = pushTok;
+ pushTok.clear();
}
+ status = LEX_TOKEN;
+ return true;
}
if (!esc) {
unsigned char c = 0; // getc() returns an int
string dummy;
getline(is, dummy);
- lyxerr[Debug::LYXLEX] << "Comment read: `" << c
+ LYXERR(Debug::LYXLEX) << "Comment read: `" << c
<< dummy << '\'' << endl;
#else
// unfortunately ignore is buggy (Lgb)
++lineno;
}
- buff.pop_back();
+ buff.resize(buff.size()-1);
status = LEX_DATA;
break;
}
c = cc;
// skip ','s
- if (c == ',') continue;
-
- if (c == '\\') {
- // escape
- buff.clear();
-
- do {
- if (c == '\\') {
- // escape the next char
- is.get(cc);
- c = cc;
- }
- buff.push_back(c);
- is.get(cc);
- c = cc;
- } while (c > ' ' && c != ',' && is);
-
- status = LEX_TOKEN;
+ if (c == ',')
continue;
- }
if (c == commentChar) {
// Read rest of line (fast :-)
string dummy;
getline(is, dummy);
- lyxerr[Debug::LYXLEX] << "Comment read: `" << c
+ LYXERR(Debug::LYXLEX) << "Comment read: `" << c
<< dummy << '\'' << endl;
#else
// but ignore is also still buggy (Lgb)
++lineno;
}
- buff.pop_back();
+ buff.resize(buff.size() -1);
status = LEX_DATA;
break;
}
while (is && c != '\n') {
is.get(cc);
c = cc;
- //lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
+ //LYXERR(Debug::LYXLEX) << "LyXLex::EatLine read char: `"
// << c << '\'' << endl;
if (c != '\r')
buff.push_back(c);
if (c == '\n') {
++lineno;
- buff.pop_back();
+ buff.resize(buff.size() - 1);
+ status = LEX_DATA;
+ return true;
+ } else if (buff.length() > 0) { // last line
status = LEX_DATA;
return true;
} else {
// There can have been a whole line pushed so
// we extract the first word and leaves the rest
// in pushTok. (Lgb)
- if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
- string tmp;
- pushTok = split(pushTok, tmp, ' ');
- buff.assign(tmp.begin(), tmp.end());
- return true;
+ if (pushTok[0] == '\\' && pushTok.find(' ') != string::npos) {
+ buff.clear();
+ pushTok = split(pushTok, buff, ' ');
} else {
- buff.assign(pushTok.begin(), pushTok.end());
- pushTok.erase();
- return true;
+ buff = pushTok;
+ pushTok.clear();
}
+ status = LEX_TOKEN;
+ return true;
}
status = 0;
}
+bool LyXLex::Pimpl::inputAvailable() {
+ return is.good();
+}
+
+
void LyXLex::Pimpl::pushToken(string const & pt)
{
pushTok = pt;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff