lyxlex-1-a with some modifications

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c782470de41aa420e64e140601e15c5e6ba084c..8844b1b9583f4817606f47adc11f399551aec0ab 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2003-04-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * lyxlex_pimpl.h: get rid of LEX_MAX_BUFF, change buff to be a
+       vector<char> instead of a char[].
+
+       * lyxlex_pimpl.C (getString): adjust
+       (next): adjust
+       (lex): use getString
+       (eatLine): adjust
+       (nextToken): adjust
+
+       * lyxlex.C (text): use pimpl_->getString()
+       (getBool): ditto
+       (findToken): ditto
+
 2003-04-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * text2.C (getInset): temp vars for cursor.par() and cursor.pos()

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 4c8f6e2f7535d47b1230e12d5d1450ca3d7d60a4..da19717fa9a9fd392fd6367affc22b42c9e75abe 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -54,7 +54,7 @@ int LyXLex::getLineNo() const
 
 string const LyXLex::text() const
 {
-       return &pimpl_->buff[0];
+       return pimpl_->getString();
 }
 
 
@@ -191,9 +191,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;
@@ -233,8 +233,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]) {

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 35d843f8dfb4f6e3fd07d446ecc52e2f35a0a8fa..3248c4a849945ada2300767b53c802fbd902874a 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -15,6 +15,8 @@ using std::ios;
 using std::istream;
 using std::endl;
 using std::lower_bound;
+using std::vector;
+using std::getline;
 
 // namespace {
 struct compare_tags {
@@ -40,7 +42,7 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
 
 string const LyXLex::Pimpl::getString() const
 {
-       return string(buff);
+       return string(buff.begin(), buff.end());
 }
 
 
@@ -132,6 +134,7 @@ void LyXLex::Pimpl::setStream(istream & i)
        lineno = 0;
 }
 
+
 void LyXLex::Pimpl::setCommentChar(char c)
 {
        commentChar = c;
@@ -147,12 +150,10 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
                        string tmp;
                        pushTok = split(pushTok, tmp, ' ');
-                       tmp.copy(buff, string::npos);
-                       buff[tmp.length()] = '\0';
+                       buff.assign(tmp.begin(), tmp.end());
                        return true;
                } else {
-                       pushTok.copy(buff, string::npos);
-                       buff[pushTok.length()] = '\0';
+                       buff.assign(pushTok.begin(), pushTok.end());
                        pushTok.erase();
                        return true;
                }
@@ -166,11 +167,13 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        c = cc;
                        if (c == commentChar) {
                                // Read rest of line (fast :-)
-                               // That is not fast... (Lgb)
 #if 1
-                               is.getline(buff, sizeof(buff));
+                               // That is not fast... (Lgb)
+                               string dummy;
+                               getline(is, dummy);
+                               
                                lyxerr[Debug::LYXLEX] << "Comment read: `" << c
-                                                     << buff << '\'' << endl;
+                                                     << dummy << '\'' << endl;
 #else
                                // unfortunately ignore is buggy (Lgb)
                                is.ignore(100, '\n');
@@ -180,20 +183,14 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        }
 
                        if (c == '\"') {
-                               int i = -1;
+                               buff.clear();
+                               
                                do {
                                        is.get(cc);
                                        c = cc;
                                        if (c != '\r')
-                                               buff[++i] = c;
-                               } while (c != '\"' && c != '\n' && is &&
-                                        i != (LEX_MAX_BUFF - 2));
-
-                               if (i == (LEX_MAX_BUFF - 2)) {
-                                       printError("Line too long");
-                                       c = '\"'; // Pretend we got a "
-                                       ++i;
-                               }
+                                               buff.push_back(c);
+                               } while (c != '\"' && c != '\n' && is);
 
                                if (c != '\"') {
                                        printError("Missing quote");
@@ -201,7 +198,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                ++lineno;
                                }
 
-                               buff[i] = '\0';
+                               buff.pop_back();
                                status = LEX_DATA;
                                break;
                        }
@@ -214,17 +211,14 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                // the type _have_ to be unsigned. It usually a
                                // lot better to use the functions from cctype
                        if (c > ' ' && is)  {
-                               int i = 0;
+                               buff.clear();
+                               
                                do {
-                                       buff[i++] = c;
+                                       buff.push_back(c);
                                        is.get(cc);
                                        c = cc;
-                               } while (c > ' ' && c != ',' && is
-                                        && (i != LEX_MAX_BUFF - 1));
-                               if (i == LEX_MAX_BUFF - 1) {
-                                       printError("Line too long");
-                               }
-                               buff[i] = '\0';
+                               } while (c > ' ' && c != ',' && is);
+
                                status = LEX_TOKEN;
                        }
 
@@ -244,7 +238,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                if (status) return true;
 
                status = is.eof() ? LEX_FEOF: LEX_UNDEF;
-               buff[0] = '\0';
+               buff.clear();
                return false;
        } else {
                unsigned char c = 0; // getc() returns an int
@@ -260,33 +254,32 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
 
                        if (c == '\\') {
                                // escape
-                               int i = 0;
+                               buff.clear();
+                               
                                do {
                                        if (c == '\\') {
                                                // escape the next char
                                                is.get(cc);
                                                c = cc;
                                        }
-                                       buff[i++] = c;
+                                       buff.push_back(c);
                                        is.get(cc);
                                        c = cc;
-                               } while (c > ' ' && c != ',' && is
-                                        && (i != LEX_MAX_BUFF - 1));
-                               if (i == LEX_MAX_BUFF - 1) {
-                                       printError("Line too long");
-                               }
-                               buff[i] = '\0';
+                               } while (c > ' ' && c != ',' && is);
+
                                status = LEX_TOKEN;
                                continue;
                        }
 
                        if (c == commentChar) {
                                // Read rest of line (fast :-)
-                               // That is still not fast... (Lgb)
 #if 1
-                               is.getline(buff, sizeof(buff));
+                               // That is still not fast... (Lgb)
+                               string dummy;
+                               getline(is, dummy);
+                               
                                lyxerr[Debug::LYXLEX] << "Comment read: `" << c
-                                                     << buff << '\'' << endl;
+                                                     << dummy << '\'' << endl;
 #else
                                // but ignore is also still buggy (Lgb)
                                // This is fast (Lgb)
@@ -298,7 +291,8 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
 
                        // string
                        if (c == '\"') {
-                               int i = -1;
+                               buff.clear();
+                               
                                bool escaped = false;
                                do {
                                        escaped = false;
@@ -312,19 +306,12 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                if (c == '\"' || c == '\\')
                                                        escaped = true;
                                                else
-                                                       buff[++i] = '\\';
+                                                       buff.push_back('\\');
                                        }
-                                       buff[++i] = c;
+                                       buff.push_back(c);
 
                                        if (!escaped && c == '\"') break;
-                               } while (c != '\n' && is &&
-                                        i != (LEX_MAX_BUFF - 2));
-
-                               if (i == (LEX_MAX_BUFF - 2)) {
-                                       printError("Line too long");
-                                       c = '\"'; // Pretend we got a "
-                                       ++i;
-                               }
+                               } while (c != '\n' && is);
 
                                if (c != '\"') {
                                        printError("Missing quote");
@@ -332,13 +319,14 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                ++lineno;
                                }
 
-                               buff[i] = '\0';
+                               buff.pop_back();
                                status = LEX_DATA;
                                break;
                        }
 
                        if (c > ' ' && is) {
-                               int i = 0;
+                               buff.clear();
+                               
                                do {
                                        if (c == '\\') {
                                                // escape the next char
@@ -346,15 +334,11 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                                c = cc;
                                                //escaped = true;
                                        }
-                                       buff[i++] = c;
+                                       buff.push_back(c);
                                        is.get(cc);
                                        c = cc;
-                               } while (c > ' ' && c != ',' && is
-                                        && (i != LEX_MAX_BUFF - 1));
-                               if (i == LEX_MAX_BUFF - 1) {
-                                       printError("Line too long");
-                               }
-                               buff[i] = '\0';
+                               } while (c > ' ' && c != ',' && is);
+
                                status = LEX_TOKEN;
                        }
                        // new line
@@ -365,7 +349,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                if (status) return true;
 
                status = is.eof() ? LEX_FEOF : LEX_UNDEF;
-               buff[0] = '\0';
+               buff.clear();
                return false;
        }
 }
@@ -390,39 +374,34 @@ int LyXLex::Pimpl::search_kw(char const * const tag) const
 int LyXLex::Pimpl::lex()
 {
        //NOTE: possible bug.
-       if (next() && status == LEX_TOKEN)
-               return search_kw(buff);
-       else
+       if (next() && status == LEX_TOKEN) {
+               return search_kw(getString().c_str());
+       } else
                return status;
 }
 
 
 bool LyXLex::Pimpl::eatLine()
 {
-       int i = 0;
+       buff.clear();
+       
        unsigned char c = '\0';
        char cc = 0;
-       while (is && c != '\n' && i != (LEX_MAX_BUFF - 1)) {
+       while (is && c != '\n') {
                is.get(cc);
                c = cc;
                //lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
                //                    << c << '\'' << endl;
                if (c != '\r')
-                       buff[i++] = c;
-       }
-       if (i == (LEX_MAX_BUFF - 1) && c != '\n') {
-               printError("Line too long");
-               c = '\n'; // Pretend we had an end of line
-               --lineno; // but don't increase line counter (netto effect)
-               ++i; // and preserve last character read.
+                       buff.push_back(c);
        }
+
        if (c == '\n') {
                ++lineno;
-               buff[--i] = '\0'; // i can never be 0 here, so no danger
+               buff.pop_back();
                status = LEX_DATA;
                return true;
        } else {
-               buff[i] = '\0';
                return false;
        }
 }
@@ -437,12 +416,10 @@ bool LyXLex::Pimpl::nextToken()
                if (pushTok.find(' ') != string::npos && pushTok[0] == '\\') {
                        string tmp;
                        pushTok = split(pushTok, tmp, ' ');
-                       tmp.copy(buff, string::npos);
-                       buff[tmp.length()] = '\0';
+                       buff.assign(tmp.begin(), tmp.end());
                        return true;
                } else {
-                       pushTok.copy(buff, string::npos);
-                       buff[pushTok.length()] = '\0';
+                       buff.assign(pushTok.begin(), pushTok.end());
                        pushTok.erase();
                        return true;
                }
@@ -455,29 +432,23 @@ bool LyXLex::Pimpl::nextToken()
                is.get(cc);
                c = cc;
                if (c >= ' ' && is) {
-                       int i = 0;
+                       buff.clear();
+                       
                        if (c == '\\') { // first char == '\\'
                                do {
-                                       buff[i++] = c;
+                                       buff.push_back(c);
                                        is.get(cc);
                                        c = cc;
-                               } while (c > ' ' && c != '\\' && is
-                                        && i != (LEX_MAX_BUFF - 1));
+                               } while (c > ' ' && c != '\\' && is);
                        } else {
                                do {
-                                       buff[i++] = c;
+                                       buff.push_back(c);
                                        is.get(cc);
                                        c = cc;
-                               } while (c >= ' ' && c != '\\' && is
-                                        && i != (LEX_MAX_BUFF - 1));
-                       }
-
-                       if (i == (LEX_MAX_BUFF - 1)) {
-                               printError("Line too long");
+                               } while (c >= ' ' && c != '\\' && is);
                        }
 
                        if (c == '\\') is.putback(c); // put it back
-                       buff[i] = '\0';
                        status = LEX_TOKEN;
                }
 
@@ -488,7 +459,7 @@ bool LyXLex::Pimpl::nextToken()
        if (status)  return true;
 
        status = is.eof() ? LEX_FEOF: LEX_UNDEF;
-       buff[0] = '\0';
+       buff.clear();
        return false;
 }
 

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index d0ec72e4567c7c586b04cf7fc24507860c3d4f87..dd18a1262f70cce19d2ec75f66307fcd80dad229 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -9,15 +9,10 @@
 
 #include <fstream>
 #include <stack>
+#include <vector>
 
 ///
 struct LyXLex::Pimpl : boost::noncopyable {
-       ///
-       enum {
-               ///
-               LEX_MAX_BUFF = 2048
-       };
-
        ///
        Pimpl(keyword_item * tab, int num);
        ///
@@ -59,7 +54,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        int no_items;
        ///
-       char buff[LEX_MAX_BUFF];
+       std::vector<char> buff;
        ///
        int status;
        ///