apply lyx.diff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3158 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 706d629d7de4f9f9ff452ed8654c2e65e01a2abf..51c94d970e33a012019f038148b04aa82b46c239 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-05  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyxlex.h:
+       * lyxlex.C: little cleanup
+
 2001-12-05  John Levon  <moz@compsoc.man.ac.uk>
 
        * BufferView_pimpl.C: fix insertAscii for insets

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 03f8236ff218da23c01d5b019f8f14de43ec2941..c44d5e0fe17146ac25f8545361eb797ba53cf3f7 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -118,9 +118,9 @@ int LyXLex::lex()
 
 int LyXLex::getInteger() const
 {
-       if (isStrInt(pimpl_->getString()))
+       if (isStrInt(pimpl_->getString())) {
                return strToInt(pimpl_->getString());
-       else {
+       } else {
                pimpl_->printError("Bad integer `$$Token'");
                return -1;
        }
@@ -191,8 +191,9 @@ string const LyXLex::getLongString(string const & endtoken)
                else // token == endtoken
                        break;
        }
-       if (!isOK())
+       if (!isOK()) {
                printError("Long string not ended by `" + endtoken + '\'');
+       }
 
        return str;
 }
@@ -200,10 +201,11 @@ string const LyXLex::getLongString(string const & endtoken)
 
 bool LyXLex::getBool() const
 {
-       if (compare(pimpl_->buff, "true") == 0)
+       if (compare(pimpl_->buff, "true") == 0) {
                return true;
-       else if (compare(pimpl_->buff, "false") != 0)
+       } else if (compare(pimpl_->buff, "false") != 0) {
                pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
+       }
        return false;
 }
 
@@ -233,34 +235,22 @@ void LyXLex::pushToken(string const & pt)
 
 
 int LyXLex::findToken(char const * str[])
-{  
-   int i = -1;
-   
-   if (next()) {
-      if (compare(pimpl_->buff, "default")) {
-        for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
-        if (!str[i][0]) {
-           pimpl_->printError("Unknown argument `$$Token'");
-           i = -1;
-        }
-      }  
-   } else
-     pimpl_->printError("file ended while scanning string token");
-   return i;
-}
-
-
-int LyXLex::checkToken(char const * str[], int print_error)
-{  
-   int i = -1;
+{
+       int i = 0;
    
-   if (compare(pimpl_->buff, "default")) {
-       for (i = 0; str[i][0] && compare(str[i], pimpl_->buff); ++i);
-       if (!str[i][0]) {
-           if (print_error)
-               pimpl_->printError("Unknown argument `$$Token'");
-           i = -1;
-       }
-   }
-   return i;
+       if (next()) {
+               if (compare(pimpl_->buff, "default")) {
+                       while (str[i][0] && compare(str[i], pimpl_->buff)) {
+                               ++i;
+                       }
+                       if (!str[i][0]) {
+                               pimpl_->printError("Unknown argument `$$Token'");
+                               i = -1;
+                       }
+               }
+       } else {
+               pimpl_->printError("file ended while scanning string token");
+               i = -1;
+       }
+       return i;
 }

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 10119f50b24703e0b03a9c615ea69a8b0edc1343..f884ccd8ebcb622797022b1fcc6b84daebf6d4a9 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -102,8 +102,6 @@ public:
        bool eatLine();
        ///
        int findToken(char const * str[]);
-       ///
-       int checkToken(char const * str[], int print_error);
 
        ///
        string const text() const;