changelogs

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 8c8eeaa1a016ebe4ad99f42591d1b44cd114ca86..664d95cfe91a5e8febc8ff2cdb0f90fe759d6766 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -14,16 +14,26 @@
 #include <config.h>
 
 #include "lyxlex.h"
-#include "lyxlex_pimpl.h"
+
 #include "debug.h"
-#include "support/filetools.h"
+#include "lyxlex_pimpl.h"
+
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::isStrDbl;
+using lyx::support::isStrInt;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::strToDbl;
+using lyx::support::strToInt;
+using lyx::support::subst;
+using lyx::support::trim;
 
-using std::ostream;
-using std::istream;
 using std::endl;
+using std::string;
+using std::istream;
+using std::ostream;
 
 
 LyXLex::LyXLex(keyword_item * tab, int num)
@@ -137,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)
 {
@@ -154,8 +164,7 @@ string const LyXLex::getLongString(string const & endtoken)
                lyxerr[Debug::PARSER] << "LongString: `"
                                      << getString() << '\'' << endl;
 
-               // We do a case independent comparison, like search_kw
-               // does.
+               // We do a case independent comparison, like search_kw does.
                if (compare_ascii_no_case(token, endtoken) == 0)
                        break;
 
@@ -191,7 +200,8 @@ bool LyXLex::getBool() const
        if (pimpl_->getString() == "true") {
                return true;
        } else if (pimpl_->getString() != "false") {
-               pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
+               pimpl_->printError("Bad boolean `$$Token'. "
+                                  "Use \"false\" or \"true\"");
        }
        return false;
 }
@@ -220,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();
+}
+
+
+LyXLex & LyXLex::operator>>(std::string & s)
+{
+       if (isOK()) {
+               next();
+               s = getString();
+       }
+       return *this;
+}
+
 
-int LyXLex::findToken(char const * str[])
+LyXLex & LyXLex::operator>>(float & s)
 {
-       if (!next()) {
-               pimpl_->printError("file ended while scanning string token");
-               return -1;
+       if (isOK()) {
+               next();
+               s = getFloat();
        }
+       return *this;
+}
+
 
-       int i = 0;
+LyXLex & LyXLex::operator>>(int & s)
+{
+       if (isOK()) {
+               next();
+               s = getInteger();
+       }
+       return *this;
+}
 
-       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;
-               }
+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;
 }