split LyXText::rowlist_ into individual Paragraph::rows_ chunks

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index bd9e3c4097c07f547ff5057aed770d52022f8438..e77c893b082d84d0765b039a254fcf04db86ae5b 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -18,6 +18,8 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
+using namespace lyx::support;
+
 using std::ostream;
 using std::istream;
 using std::endl;
@@ -52,12 +54,6 @@ int LyXLex::getLineNo() const
 }
 
 
-string const LyXLex::text() const
-{
-       return &pimpl_->buff[0];
-}
-
-
 istream & LyXLex::getStream()
 {
        return pimpl_->is;
@@ -113,12 +109,10 @@ int LyXLex::lex()
 
 int LyXLex::getInteger() const
 {
-       if (isStrInt(pimpl_->getString())) {
+       if (isStrInt(pimpl_->getString()))
                return strToInt(pimpl_->getString());
-       } else {
-               pimpl_->printError("Bad integer `$$Token'");
-               return -1;
-       }
+       pimpl_->printError("Bad integer `$$Token'");
+       return -1;
 }
 
 
@@ -130,10 +124,8 @@ float LyXLex::getFloat() const
        string str = subst(pimpl_->getString(), ",", ".");
        if (isStrDbl(str))
                return strToDbl(str);
-       else {
-               pimpl_->printError("Bad float `$$Token'");
-               return -1;
-       }
+       pimpl_->printError("Bad float `$$Token'");
+       return -1;
 }
 
 
@@ -144,7 +136,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::readLyXformat2 uses
+// here, but it is not possible because Buffer::readBody uses
 // explicit tokens (JMarc)
 string const LyXLex::getLongString(string const & endtoken)
 {
@@ -195,9 +187,9 @@ string const LyXLex::getLongString(string const & endtoken)
 
 bool LyXLex::getBool() const
 {
-       if (compare(pimpl_->buff, "true") == 0) {
+       if (pimpl_->getString() == "true") {
                return true;
-       } else if (compare(pimpl_->buff, "false") != 0) {
+       } else if (pimpl_->getString() != "false") {
                pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
        }
        return false;
@@ -237,8 +229,10 @@ int LyXLex::findToken(char const * str[])
 
        int i = 0;
 
-       if (compare(pimpl_->buff, "default")) {
-               while (str[i][0] && compare(str[i], pimpl_->buff)) {
+       string const search_token = pimpl_->getString();
+
+       if (search_token != "default") {
+               while (str[i][0] && str[i] != search_token) {
                        ++i;
                }
                if (!str[i][0]) {