X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.cpp;h=06a3408f41e9591d77afabfbb3074d2f3b18d9de;hb=75ffcc8e866de04b076c81d78003a86efca98e4e;hp=b5f72e51a2c65383087a2b66d95a738084d7e085;hpb=c88e7a7ef66a880b5fb6166ff9151001269bc7cd;p=lyx.git diff --git a/src/Lexer.cpp b/src/Lexer.cpp index b5f72e51a2..06a3408f41 100644 --- a/src/Lexer.cpp +++ b/src/Lexer.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Alejandro Aguilar Sierra - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon * @@ -14,12 +14,14 @@ #include #include "Lexer.h" +#include "Format.h" #include "support/convert.h" #include "support/debug.h" #include "support/FileName.h" #include "support/filetools.h" #include "support/gzstream.h" +#include "support/lassert.h" #include "support/lstrings.h" #include "support/lyxalgo.h" #include "support/types.h" @@ -102,6 +104,8 @@ public: string pushTok; /// char commentChar; + /// used for error messages + string context; private: /// non-copyable Pimpl(Pimpl const &); @@ -171,7 +175,9 @@ void Lexer::Pimpl::printError(string const & message) const { string const tmpmsg = subst(message, "$$Token", getString()); lyxerr << "LyX: " << tmpmsg << " [around line " << lineno - << " of file " << to_utf8(makeDisplayPath(name)) << ']' << endl; + << " of file " << to_utf8(makeDisplayPath(name)) + << " current token: '" << getString() << "'" + << " context: '" << context << "']" << endl; } @@ -232,10 +238,14 @@ void Lexer::Pimpl::popTable() bool Lexer::Pimpl::setFile(FileName const & filename) { +#ifdef TEX2LYX + // tex2lyx does not read lyxrc and therefore can't really check for + // zipped formats. + if (false) { +#else // Check the format of the file. - string const format = filename.guessFormatFromContents(); - - if (format == "gzip" || format == "zip" || format == "compress") { + if (formats.isZippedFile(filename)) { +#endif LYXERR(Debug::LYXLEX, "lyxlex: compressed"); // The check only outputs a debug message, because it triggers // a bug in compaq cxx 6.2, where is_open() returns 'true' for @@ -245,9 +255,10 @@ bool Lexer::Pimpl::setFile(FileName const & filename) "file or stream already set."); gz_.open(filename.toFilesystemEncoding().c_str(), ios::in); is.rdbuf(&gz_); - name = filename.absFilename(); + name = filename.absFileName(); lineno = 0; - return gz_.is_open() && is.good(); + if (!gz_.is_open() || !is.good()) + return false; } else { LYXERR(Debug::LYXLEX, "lyxlex: UNcompressed"); @@ -258,12 +269,25 @@ bool Lexer::Pimpl::setFile(FileName const & filename) LYXERR(Debug::LYXLEX, "Error in Lexer::setFile: " "file or stream already set."); } - fb_.open(filename.toFilesystemEncoding().c_str(), ios::in); + fb_.open(filename.toSafeFilesystemEncoding().c_str(), ios::in); is.rdbuf(&fb_); - name = filename.absFilename(); + name = filename.absFileName(); lineno = 0; - return fb_.is_open() && is.good(); + if (!fb_.is_open() || !is.good()) + return false; } + + // Skip byte order mark. + if (is.peek() == 0xef) { + is.get(); + if (is.peek() == 0xbb) { + is.get(); + LASSERT(is.get() == 0xbf, /**/); + } else + is.unget(); + } + + return true; } @@ -309,11 +333,6 @@ bool Lexer::Pimpl::next(bool esc /* = false */) is.get(cc); c = cc; - // skip ','s - if (esc && c == ',') - continue; - - if (c == commentChar) { // Read rest of line (fast :-) #if 1 @@ -378,13 +397,13 @@ bool Lexer::Pimpl::next(bool esc /* = false */) break; } - if (!esc && c == ',') + if (c == ',') continue; /* Skip ','s */ - // using relational operators with chars other - // than == and != is not safe. And if it is done - // the type _have_ to be unsigned. It usually a - // lot better to use the functions from cctype + // using relational operators with chars other + // than == and != is not safe. And if it is done + // the type _have_ to be unsigned. It usually a + // lot better to use the functions from cctype if (c > ' ' && is) { buff.clear(); @@ -402,7 +421,7 @@ bool Lexer::Pimpl::next(bool esc /* = false */) status = LEX_TOKEN; } - if (!esc && c == '\r' && is) { + if (c == '\r' && is) { // The Windows support has lead to the // possibility of "\r\n" at the end of // a line. This will stop LyX choking @@ -459,7 +478,7 @@ bool Lexer::Pimpl::eatLine() is.get(cc); c = cc; //LYXERR(Debug::LYXLEX, "Lexer::EatLine read char: `" << c << '\''); - if (c != '\r') + if (c != '\r' && is) buff.push_back(c); } @@ -500,7 +519,7 @@ bool Lexer::Pimpl::nextToken() char cc = 0; is.get(cc); c = cc; - if (c >= ' ' && is) { + if ((c >= ' ' || c == '\t') && is) { buff.clear(); if (c == '\\') { // first char == '\\' @@ -514,7 +533,7 @@ bool Lexer::Pimpl::nextToken() buff.push_back(c); is.get(cc); c = cc; - } while (c >= ' ' && c != '\\' && is); + } while ((c >= ' ' || c == '\t') && c != '\\' && is); } if (c == '\\') @@ -637,6 +656,7 @@ void Lexer::setCommentChar(char c) pimpl_->setCommentChar(c); } + int Lexer::lex() { return pimpl_->lex(); @@ -751,15 +771,18 @@ string const Lexer::getLongString(string const & endtoken) bool Lexer::getBool() const { - if (pimpl_->getString() == "true") { + string const s = pimpl_->getString(); + if (s == "false" || s == "0") { + lastReadOk_ = true; + return false; + } + if (s == "true" || s == "1") { lastReadOk_ = true; return true; - } else if (pimpl_->getString() != "false") { - pimpl_->printError("Bad boolean `$$Token'. " - "Use \"false\" or \"true\""); - lastReadOk_ = false; } - lastReadOk_ = true; + pimpl_->printError("Bad boolean `$$Token'. " + "Use \"false\" or \"true\""); + lastReadOk_ = false; return false; } @@ -876,9 +899,19 @@ Lexer & Lexer::operator>>(bool & s) } +Lexer & Lexer::operator>>(char & c) +{ + string s; + operator>>(s); + if (!s.empty()) + c = s[0]; + return *this; +} + + // 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) +string Lexer::quoteString(string const & arg) { string res; res += '"'; @@ -888,4 +921,46 @@ string const Lexer::quoteString(string const & arg) } +// same for docstring +docstring Lexer::quoteString(docstring const & arg) +{ + docstring res; + res += '"'; + res += subst(subst(arg, from_ascii("\\"), from_ascii("\\\\")), + from_ascii("\""), from_ascii("\\\"")); + res += '"'; + return res; +} + + +Lexer & Lexer::operator>>(char const * required) +{ + string token; + *this >> token; + if (token != required) { + LYXERR0("Missing '" << required << "'-tag in " << pimpl_->context + << ". Got " << token << " instead. Line: " << lineNumber()); + pushToken(token); + } + return *this; +} + + +bool Lexer::checkFor(char const * required) +{ + string token; + *this >> token; + if (token == required) + return true; + pushToken(token); + return false; +} + + +void Lexer::setContext(std::string const & str) +{ + pimpl_->context = str; +} + + } // namespace lyx