string pushTok;
///
char commentChar;
+ /// used for error messages
+ string context;
private:
/// non-copyable
Pimpl(Pimpl 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;
}
is.get(cc);
c = cc;
- // skip ','s
- if (esc && c == ',')
- continue;
-
-
if (c == commentChar) {
// Read rest of line (fast :-)
#if 1
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();
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
char cc = 0;
is.get(cc);
c = cc;
- if (c >= ' ' && is) {
+ if ((c >= ' ' || c == '\t') && is) {
buff.clear();
if (c == '\\') { // first char == '\\'
buff.push_back(c);
is.get(cc);
c = cc;
- } while (c >= ' ' && c != '\\' && is);
+ } while ((c >= ' ' || c == '\t') && c != '\\' && is);
}
if (c == '\\')
pimpl_->setCommentChar(c);
}
+
int Lexer::lex()
{
return pimpl_->lex();
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;
}
}
+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 += '"';
}
+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