///
bool next(bool esc = false);
///
- int search_kw(char const * const tag) const;
+ int searchKeyword(char const * const tag) const;
///
int lex();
///
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;
}
status = LEX_TOKEN;
return true;
}
- if (!esc) {
- unsigned char c = 0; // getc() returns an int
- char cc = 0;
- status = 0;
- while (is && !status) {
- is.get(cc);
- c = cc;
- if (c == commentChar) {
- // Read rest of line (fast :-)
-#if 1
- // That is not fast... (Lgb)
- string dummy;
- getline(is, dummy);
-
- LYXERR(Debug::LYXLEX, "Comment read: `" << c << dummy << '\'');
-#else
- // unfortunately ignore is buggy (Lgb)
- is.ignore(100, '\n');
-#endif
- ++lineno;
- continue;
- }
-
- if (c == '\"') {
- buff.clear();
-
- do {
- is.get(cc);
- c = cc;
- if (c != '\r')
- buff.push_back(c);
- } while (c != '\"' && c != '\n' && is);
-
- if (c != '\"') {
- printError("Missing quote");
- if (c == '\n')
- ++lineno;
- }
-
- buff.resize(buff.size()-1);
- status = LEX_DATA;
- break;
- }
-
- 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
- if (c > ' ' && is) {
- buff.clear();
-
- do {
- buff.push_back(c);
- is.get(cc);
- c = cc;
- } while (c > ' ' && c != ',' && is);
-
- status = LEX_TOKEN;
- }
-
- 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
- // when it expected to find a '\n'
- is.get(cc);
- c = cc;
- }
-
- if (c == '\n')
- ++lineno;
- }
- if (status)
- return true;
- status = is.eof() ? LEX_FEOF: LEX_UNDEF;
- buff.clear();
- return false;
- } else {
- unsigned char c = 0; // getc() returns an int
- char cc = 0;
-
- status = 0;
- while (is && !status) {
- is.get(cc);
- c = cc;
-
- // skip ','s
- if (c == ',')
- continue;
+ unsigned char c = 0; // getc() returns an int
+ char cc = 0;
+ status = 0;
+ while (is && !status) {
+ is.get(cc);
+ c = cc;
- if (c == commentChar) {
- // Read rest of line (fast :-)
+ if (c == commentChar) {
+ // Read rest of line (fast :-)
#if 1
- // That is still not fast... (Lgb)
- string dummy;
- getline(is, dummy);
+ // That is not fast... (Lgb)
+ string dummy;
+ getline(is, dummy);
- LYXERR(Debug::LYXLEX, "Comment read: `" << c << dummy << '\'');
+ LYXERR(Debug::LYXLEX, "Comment read: `" << c << dummy << '\'');
#else
- // but ignore is also still buggy (Lgb)
- // This is fast (Lgb)
- is.ignore(100, '\n');
+ // unfortunately ignore is buggy (Lgb)
+ is.ignore(100, '\n');
#endif
- ++lineno;
- continue;
- }
+ ++lineno;
+ continue;
+ }
+
+ if (c == '\"') {
+ buff.clear();
- // string
- if (c == '\"') {
- buff.clear();
+ if (esc) {
bool escaped = false;
do {
break;
} while (c != '\n' && is);
- if (c != '\"') {
- printError("Missing quote");
- if (c == '\n')
- ++lineno;
- }
+ } else {
+
+ do {
+ is.get(cc);
+ c = cc;
+ if (c != '\r')
+ buff.push_back(c);
+ } while (c != '\"' && c != '\n' && is);
- buff.resize(buff.size() -1);
- status = LEX_DATA;
- break;
}
- if (c > ' ' && is) {
- buff.clear();
+ if (c != '\"') {
+ printError("Missing quote");
+ if (c == '\n')
+ ++lineno;
+ }
- do {
- if (c == '\\') {
- // escape the next char
- is.get(cc);
- c = cc;
- //escaped = true;
- }
- buff.push_back(c);
+ buff.resize(buff.size() - 1);
+ status = LEX_DATA;
+ break;
+ }
+
+ 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
+ if (c > ' ' && is) {
+ buff.clear();
+
+ do {
+ if (esc && c == '\\') {
+ // escape the next char
is.get(cc);
c = cc;
- } while (c > ' ' && c != ',' && is);
+ //escaped = true;
+ }
+ buff.push_back(c);
+ is.get(cc);
+ c = cc;
+ } while (c > ' ' && c != ',' && is);
+ status = LEX_TOKEN;
+ }
- status = LEX_TOKEN;
- }
- // new line
- if (c == '\n')
- ++lineno;
+ 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
+ // when it expected to find a '\n'
+ is.get(cc);
+ c = cc;
}
- if (status)
- return true;
+ if (c == '\n')
+ ++lineno;
- status = is.eof() ? LEX_FEOF : LEX_UNDEF;
- buff.clear();
- return false;
}
+ if (status)
+ return true;
+
+ status = is.eof() ? LEX_FEOF: LEX_UNDEF;
+ buff.clear();
+ return false;
}
-int Lexer::Pimpl::search_kw(char const * const tag) const
+int Lexer::Pimpl::searchKeyword(char const * const tag) const
{
LexerKeyword search_tag = { tag, 0 };
LexerKeyword * res =
{
//NOTE: possible bug.
if (next() && status == LEX_TOKEN)
- return search_kw(getString().c_str());
+ return searchKeyword(getString().c_str());
return status;
}
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();
LYXERR(Debug::PARSER, "LongString: `" << getString() << '\'');
- // We do a case independent comparison, like search_kw does.
+ // We do a case independent comparison, like searchKeyword does.
if (compare_ascii_no_case(token, endtoken) == 0)
break;
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