reverse last change

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 958c7a14e680b33cbbc6b05140ae4026a77c1e63..3bd90f40b4381f8ffd86a8504cf23c9908c621b8 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,15 +1,14 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
+/**
+ * \file lyxlex.C
+ * Copyright 1996-2002 the LyX Team
+ * Read the file COPYING
  *
- *           Copyright 1996-2001 The LyX Team.
+ * Generalized simple lexical analyzer.
+ * It can be used for simple syntax parsers, like lyxrc,
+ * texclass and others to come.
  *
- *   Generalized simple lexical analizer.
- *   It can be used for simple syntax parsers, like lyxrc,
- *   texclass and others to come.   [asierra30/03/96]
- *
- * ====================================================== */
+ * \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ */
 
 #include <config.h>
 
@@ -33,7 +32,7 @@ LyXLex::LyXLex(keyword_item * tab, int num)
 {}
 
 
-LyXLex::~LyXLex() 
+LyXLex::~LyXLex()
 {
        delete pimpl_;
 }
@@ -63,7 +62,7 @@ string const LyXLex::text() const
 }
 
 
-std::istream & LyXLex::getStream()
+istream & LyXLex::getStream()
 {
        return pimpl_->is;
 }
@@ -118,9 +117,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;
        }
@@ -131,7 +130,7 @@ float 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). 
+       // avoid).
        string str = subst(pimpl_->getString(), ",", ".");
        if (isStrDbl(str))
                return strToDbl(str);
@@ -150,7 +149,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
-// explicit tokens (JMarc) 
+// explicit tokens (JMarc)
 string const LyXLex::getLongString(string const & endtoken)
 {
        string str, prefix;
@@ -160,39 +159,39 @@ string const LyXLex::getLongString(string const & endtoken)
                if (!eatLine())
                        // blank line in the file being read
                        continue;
-               
-               string const token = frontStrip(strip(getString()), " \t");
-               
+
+               string const token = trim(getString(), " \t");
+
                lyxerr[Debug::PARSER] << "LongString: `"
                                      << getString() << '\'' << endl;
 
                // We do a case independent comparison, like search_kw
                // does.
-                if (compare_no_case(token, endtoken) != 0) {
-                       string tmpstr = getString();
-                       if (firstline) {
-                               unsigned int i = 0;
-                               while(i < tmpstr.length()
-                                     && tmpstr[i] == ' ') {
-                                       ++i;
-                                       prefix += ' ';
-                               }
-                               firstline = false;
-                               lyxerr[Debug::PARSER] << "Prefix = `" << prefix
-                                                     << '\'' << endl;
-                       } 
-
-                       if (!prefix.empty() 
-                           && prefixIs(tmpstr, prefix)) {
-                               tmpstr.erase(0, prefix.length() - 1);
-                       }
-                       str += frontStrip(tmpstr, "\t") + '\n';
-                }
-               else // token == endtoken
+               if (compare_ascii_no_case(token, endtoken) == 0)
                        break;
+
+               string tmpstr = getString();
+               if (firstline) {
+                       string::size_type i(tmpstr.find_first_not_of(' '));
+                       if (i != string::npos)
+                               prefix = tmpstr.substr(0, i);
+                       firstline = false;
+                       lyxerr[Debug::PARSER]
+                               << "Prefix = `" << prefix << "\'" << endl;
+               }
+
+               // further lines in long strings may have the same
+               // whitespace prefix as the first line. Remove it.
+               if (prefix.length() && prefixIs(tmpstr, prefix)) {
+                       tmpstr.erase(0, prefix.length() - 1);
+               }
+
+               str += ltrim(tmpstr, "\t") + '\n';
        }
-       if (!isOK())
+
+       if (!isOK()) {
                printError("Long string not ended by `" + endtoken + '\'');
+       }
 
        return str;
 }
@@ -200,10 +199,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 +233,23 @@ 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;
-}
+{
+       if (!next()) {
+               pimpl_->printError("file ended while scanning string token");
+               return -1;
+       }
+
+       int i = 0;
 
+       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;
+               }
+       }
 
-int LyXLex::checkToken(char const * str[], int print_error)
-{  
-   int i = -1;
-   
-   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;
+       return i;
 }