fix crash after removing a table row (again due to uncorrected cursor

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 77babdab04551ca71cc9be762040e4eeacc36a80..9797b8a8a9cd81b3c48d1c83fd054662a51a1c2e 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -17,10 +17,11 @@
 #ifndef LYXLEX_H
 #define LYXLEX_H
 
+#include <boost/utility.hpp>
+
 #include <iosfwd>
+#include <string>
 
-#include "support/std_string.h"
-#include <boost/utility.hpp>
 
 ///
 struct keyword_item {
@@ -54,10 +55,14 @@ public:
                LEX_TOKEN = -4
        };
 
-       /// file is open and end of file is not reached
+       /// stream is open and end of stream is not reached
        bool isOK() const;
+       /// stream is ok
+       operator void const *() const;
+       /// stream is not ok
+       bool operator!() const;
        /// return true if able to open file, else false
-       bool setFile(string const & filename);
+       bool setFile(std::string const & filename);
        ///
        void setStream(std::istream & is);
        ///
@@ -81,7 +86,7 @@ public:
        */
        bool nextToken();
        /// Push a token, that next token got from lyxlex.
-       void pushToken(string const &);
+       void pushToken(std::string const &);
 
        ///
        int getLineNo() const;
@@ -93,7 +98,7 @@ public:
        ///
        float getFloat() const;
        ///
-       string const getString() const;
+       std::string const getString() const;
 
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
@@ -102,15 +107,12 @@ public:
            each following line. This mechanism does not work
            perfectly if you use tabs.
        */
-       string const getLongString(string const & endtag);
+       std::string const getLongString(std::string const & endtag);
 
        ///
        bool eatLine();
-       ///
-       int findToken(char const * str[]);
 
-       /** Pushes a token list on a stack and replaces it with a new one.
-        */
+       /// Pushes a token list on a stack and replaces it with a new one.
        void pushTable(keyword_item *, int);
 
        /** Pops a token list into void and replaces it with the one now
@@ -122,12 +124,24 @@ public:
            and file name. If message contains the substring `$$Token',
            it is replaced with the value of GetString()
        */
-       void printError(string const & message) const;
+       void printError(std::string const & message) const;
 
-       /**
-          Prints the current token table on the supplied ostream.
-       */
+       /// Prints the current token table on the supplied ostream.
        void printTable(std::ostream &);
+
+       /// extract string
+       LyXLex & operator>>(std::string &);
+       /// extract float
+       LyXLex & operator>>(float &);
+       /// extract double
+       LyXLex & operator>>(double &);
+       /// extract integer
+       LyXLex & operator>>(int &);
+       /// extract unsigned integer
+       LyXLex & operator>>(unsigned int &);
+       /// extract bool
+       LyXLex & operator>>(bool &);
+
 private:
        struct Pimpl;
        ///
@@ -139,7 +153,7 @@ private:
     This is needed to ensure that the pop is done upon exit from methods
     with more than one exit point or that can return as a response to
     exceptions.
-    @autor Lgb
+    @author Lgb
 */
 struct pushpophelper {
        ///