fix some C++ parsing bugs

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index bd9e3c4097c07f547ff5057aed770d52022f8438..4c8f6e2f7535d47b1230e12d5d1450ca3d7d60a4 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -113,12 +113,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 +128,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 +140,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)
 {