changelogs

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 02192ad4e7e70c1590324b3ce32f2e76fb8781e1..664d95cfe91a5e8febc8ff2cdb0f90fe759d6766 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -147,7 +147,7 @@ string const LyXLex::getString() const
 
 
 // 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)
 {
@@ -230,27 +230,67 @@ 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();
+}
 
-int LyXLex::findToken(char const * str[])
+
+LyXLex & LyXLex::operator>>(std::string & s)
 {
-       if (!next()) {
-               pimpl_->printError("file ended while scanning string token");
-               return -1;
+       if (isOK()) {
+               next();
+               s = getString();
        }
+       return *this;
+}
 
-       int i = 0;
 
-       string const search_token = pimpl_->getString();
+LyXLex & LyXLex::operator>>(float & s)
+{
+       if (isOK()) {
+               next();
+               s = getFloat();
+       }
+       return *this;
+}
 
-       if (search_token != "default") {
-               while (str[i][0] && str[i] != search_token) {
-                       ++i;
-               }
-               if (!str[i][0]) {
-                       pimpl_->printError("Unknown argument `$$Token'");
-                       i = -1;
-               }
+
+LyXLex & LyXLex::operator>>(int & s)
+{
+       if (isOK()) {
+               next();
+               s = getInteger();
+       }
+       return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(unsigned int & s)
+{
+       if (isOK()) {
+               next();
+               s = getInteger();
        }
+       return *this;
+}
 
-       return i;
+
+LyXLex & LyXLex::operator>>(bool & s)
+{
+       if (isOK()) {
+               next();
+               s = getBool();
+       }
+       return *this;
 }