// I would prefer to give a tag number instead of an explicit token
-// here, but it is not possible because Buffer::readBody uses
+// here, but it is not possible because Buffer::readDocument uses
// explicit tokens (JMarc)
string const LyXLex::getLongString(string const & endtoken)
{
pimpl_->pushToken(pt);
}
-
-int LyXLex::findToken(char const * str[])
+LyXLex::operator void const *() const
{
- if (!next()) {
- pimpl_->printError("file ended while scanning string token");
- return -1;
- }
-
- int i = 0;
-
- string const search_token = pimpl_->getString();
-
- if (search_token != "default") {
- while (str[i][0] && str[i] != search_token) {
- ++i;
- }
- if (!str[i][0]) {
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
- }
-
- return i;
-}
-
-
-LyXLex::operator void *() const
-{
- return isOK() ? const_cast<LyXLex *>(this) : 0;
+ // This behaviour is NOT the same as the std::streams which would
+ // use fail() here. However, our implementation of getString() et al.
+ // can cause the eof() and fail() bits to be set, even though we
+ // haven't tried to read 'em.
+ return pimpl_->is.bad() ? 0 : this;
}
bool LyXLex::operator!() const
{
- return !isOK();
+ return pimpl_->is.bad();
}
}
return *this;
}
-
-