Fix loop when opening TOC widget in an empty document, basically by Richard Heck.

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 664d95cfe91a5e8febc8ff2cdb0f90fe759d6766..d8622eb9ce67c3b0e4b0bbea5986b5113348d8c2 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -18,17 +18,21 @@
 #include "debug.h"
 #include "lyxlex_pimpl.h"
 
+#include "support/convert.h"
 #include "support/lstrings.h"
 
-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;
+#include <sstream>
+
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::isStrDbl;
+using support::isStrInt;
+using support::ltrim;
+using support::prefixIs;
+using support::subst;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -49,7 +53,7 @@ LyXLex::~LyXLex()
 
 bool LyXLex::isOK() const
 {
-       return pimpl_->is.good();
+       return pimpl_->inputAvailable();
 }
 
 
@@ -95,7 +99,7 @@ void LyXLex::printError(string const & message) const
 }
 
 
-bool LyXLex::setFile(string const & filename)
+bool LyXLex::setFile(support::FileName const & filename)
 {
        return pimpl_->setFile(filename);
 }
@@ -120,21 +124,37 @@ int LyXLex::lex()
 
 int LyXLex::getInteger() const
 {
+       lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
+       if (!lastReadOk_) {
+               pimpl_->printError("integer token missing");
+               return -1;
+       }
+
        if (isStrInt(pimpl_->getString()))
-               return strToInt(pimpl_->getString());
+               return convert<int>(pimpl_->getString());
+
+       lastReadOk_ = false;
        pimpl_->printError("Bad integer `$$Token'");
        return -1;
 }
 
 
-float LyXLex::getFloat() const
+double LyXLex::getFloat() const
 {
        // replace comma with dot in case the file was written with
        // the wrong locale (should be rare, but is easy enough to
        // avoid).
-       string str = subst(pimpl_->getString(), ",", ".");
+       lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
+       if (!lastReadOk_) {
+               pimpl_->printError("float token missing");
+               return -1;
+       }
+
+       string const str = subst(pimpl_->getString(), ",", ".");
        if (isStrDbl(str))
-               return strToDbl(str);
+               return convert<double>(str);
+
+       lastReadOk_ = false;
        pimpl_->printError("Bad float `$$Token'");
        return -1;
 }
@@ -142,7 +162,23 @@ float LyXLex::getFloat() const
 
 string const LyXLex::getString() const
 {
+       lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
+
+       if (lastReadOk_)
        return pimpl_->getString();
+
+       return string();
+}
+
+
+docstring const LyXLex::getDocString() const
+{
+       lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
+       
+       if (lastReadOk_)
+               return pimpl_->getDocString();
+
+       return docstring();
 }
 
 
@@ -154,14 +190,14 @@ string const LyXLex::getLongString(string const & endtoken)
        string str, prefix;
        bool firstline = true;
 
-       while (isOK()) {
+       while (pimpl_->is) { //< eatLine only reads from is, not from pushTok
                if (!eatLine())
                        // blank line in the file being read
                        continue;
 
                string const token = trim(getString(), " \t");
 
-               lyxerr[Debug::PARSER] << "LongString: `"
+               LYXERR(Debug::PARSER) << "LongString: `"
                                      << getString() << '\'' << endl;
 
                // We do a case independent comparison, like search_kw does.
@@ -174,7 +210,7 @@ string const LyXLex::getLongString(string const & endtoken)
                        if (i != string::npos)
                                prefix = tmpstr.substr(0, i);
                        firstline = false;
-                       lyxerr[Debug::PARSER]
+                       LYXERR(Debug::PARSER)
                                << "Prefix = `" << prefix << "\'" << endl;
                }
 
@@ -187,7 +223,7 @@ string const LyXLex::getLongString(string const & endtoken)
                str += ltrim(tmpstr, "\t") + '\n';
        }
 
-       if (!isOK()) {
+       if (!pimpl_->is) {
                printError("Long string not ended by `" + endtoken + '\'');
        }
 
@@ -198,11 +234,14 @@ string const LyXLex::getLongString(string const & endtoken)
 bool LyXLex::getBool() const
 {
        if (pimpl_->getString() == "true") {
+               lastReadOk_ = true;
                return true;
        } else if (pimpl_->getString() != "false") {
                pimpl_->printError("Bad boolean `$$Token'. "
                                   "Use \"false\" or \"true\"");
+               lastReadOk_ = false;
        }
+       lastReadOk_ = true;
        return false;
 }
 
@@ -236,13 +275,13 @@ LyXLex::operator void const *() const
        // 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;
+       return lastReadOk_? this: 0;
 }
 
 
 bool LyXLex::operator!() const
 {
-       return pimpl_->is.bad();
+       return !lastReadOk_;
 }
 
 
@@ -251,16 +290,32 @@ LyXLex & LyXLex::operator>>(std::string & s)
        if (isOK()) {
                next();
                s = getString();
+       } else {
+               lastReadOk_ = false;
        }
        return *this;
 }
 
 
-LyXLex & LyXLex::operator>>(float & s)
+LyXLex & LyXLex::operator>>(docstring & s)
+{
+       if (isOK()) {
+               next();
+               s = getDocString();
+       } else {
+               lastReadOk_ = false;
+       }
+       return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(double & s)
 {
        if (isOK()) {
                next();
                s = getFloat();
+       } else {
+               lastReadOk_ = false;
        }
        return *this;
 }
@@ -271,6 +326,8 @@ LyXLex & LyXLex::operator>>(int & s)
        if (isOK()) {
                next();
                s = getInteger();
+       } else {
+               lastReadOk_ = false;
        }
        return *this;
 }
@@ -281,6 +338,8 @@ LyXLex & LyXLex::operator>>(unsigned int & s)
        if (isOK()) {
                next();
                s = getInteger();
+       } else {
+               lastReadOk_ = false;
        }
        return *this;
 }
@@ -291,6 +350,20 @@ LyXLex & LyXLex::operator>>(bool & s)
        if (isOK()) {
                next();
                s = getBool();
+       } else {
+               lastReadOk_ = false;
        }
        return *this;
 }
+
+
+/// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
+string const LyXLex::quoteString(string const & arg)
+{
+       std::ostringstream os;
+       os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
+       return os.str();
+}
+
+
+} // namespace lyx