-int LyXLex::FindToken(char const * str[])
-{
- int i = -1;
-
- if (next()) {
- if (compare(pimpl_->buff, "default")) {
- for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
- if (!str[i][0]) {
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
- }
- } else
- pimpl_->printError("file ended while scanning string token");
- return i;
-}
-
-
-int LyXLex::CheckToken(char const * str[], int print_error)
-{
- int i = -1;
-
- if (compare(pimpl_->buff, "default")) {
- for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
- if (!str[i][0]) {
- if (print_error)
- pimpl_->printError("Unknown argument `$$Token'");
- i = -1;
- }
- }
- return i;
+void LyXLex::pushToken(string const & pt)
+{
+ pimpl_->pushToken(pt);
+}
+
+LyXLex::operator void const *() const
+{
+ // 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 pimpl_->is.bad();
+}
+
+
+LyXLex & LyXLex::operator>>(std::string & s)
+{
+ if (isOK()) {
+ next();
+ s = getString();
+ }
+ return *this;