[PATCH] lyxlex cleanup

[John Levon]

please apply ...

thanks
john

-- 
"Faced with the prospect of rereading this book, I would rather have 
 my brains ripped out by a plastic fork."
        - Charles Cooper on "Business at the Speed of Thought" 

Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.436
diff -u -r1.436 ChangeLog
--- src/ChangeLog       2001/12/05 15:34:41     1.436
+++ src/ChangeLog       2001/12/05 18:16:29
@@ -1,3 +1,8 @@
+2001-12-05  John Levon  <[EMAIL PROTECTED]>
+
+       * lyxlex.h:
+       * lyxlex.C: little cleanup
+ 
 2001-12-05  Juergen Vigna  <[EMAIL PROTECTED]>
 
        * CutAndPaste.C (pasteSelection): remove not allowed insets/chars and
Index: src/lyxlex.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxlex.h,v
retrieving revision 1.26
diff -u -r1.26 lyxlex.h
--- src/lyxlex.h        2001/11/26 11:08:42     1.26
+++ src/lyxlex.h        2001/12/05 18:16:29
@@ -102,8 +102,6 @@
        bool eatLine();
        ///
        int findToken(char const * str[]);
-       ///
-       int checkToken(char const * str[], int print_error);
 
        ///
        string const text() const;
Index: src/lyxlex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxlex.C,v
retrieving revision 1.26
diff -u -r1.26 lyxlex.C
--- src/lyxlex.C        2001/12/05 08:04:14     1.26
+++ src/lyxlex.C        2001/12/05 18:16:29
@@ -118,9 +118,9 @@
 
 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 @@
                else // token == endtoken
                        break;
        }
-       if (!isOK())
+       if (!isOK()) {
                printError("Long string not ended by `" + endtoken + '\'');
+       }
 
        return str;
 }
@@ -200,10 +201,11 @@
 
 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 @@
 
 
 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;
 }