Almost fix 'make check'. The only remaining problem is an undefined

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 4c5ea7d6941b264c5513bd5a8d9188dd19c75636..0c1469a9eec86c6e541bbe803f6601f35992400f 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -17,11 +17,17 @@
 #ifndef LYXLEX_H
 #define LYXLEX_H
 
+#include "support/docstring.h"
+
 #include <boost/utility.hpp>
 
 #include <iosfwd>
 
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 struct keyword_item {
        ///
@@ -54,10 +60,18 @@ public:
                LEX_TOKEN = -4
        };
 
-       /// file is open and end of file is not reached
+       /// stream is open and end of stream is not reached
+       /// FIXME: Rename to good() since this is the name of the
+       /// corresponding std::stream method.
        bool isOK() const;
+       /// stream is ok
+       /// FIXME: This does not behave like the std::stream counterpart.
+       operator void const *() const;
+       /// stream is not ok
+       /// FIXME: This does not behave like the std::stream counterpart.
+       bool operator!() const;
        /// return true if able to open file, else false
-       bool setFile(std::string const & filename);
+       bool setFile(support::FileName const & filename);
        ///
        void setStream(std::istream & is);
        ///
@@ -91,10 +105,13 @@ public:
        ///
        bool getBool() const;
        ///
-       float getFloat() const;
+       double getFloat() const;
        ///
        std::string const getString() const;
 
+       ///
+       docstring const getDocString() const;
+
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
            serves as a template for how many spaces the lines
@@ -106,11 +123,8 @@ public:
 
        ///
        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
@@ -124,12 +138,28 @@ public:
        */
        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 docstring
+       LyXLex & operator>>(docstring &);
+       /// extract double
+       LyXLex & operator>>(double &);
+       /// extract integer
+       LyXLex & operator>>(int &);
+       /// extract unsigned integer
+       LyXLex & operator>>(unsigned int &);
+       /// extract bool
+       LyXLex & operator>>(bool &);
+
+       /// Quotes a string so that reading it again with LyXLex::next(true)
+       /// gets the original string
+       static std::string const quoteString(std::string const &);
+
 private:
-       struct Pimpl;
+       class Pimpl;
        ///
        Pimpl * pimpl_;
 };
@@ -139,9 +169,10 @@ 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 {
+class pushpophelper {
+public:
        ///
        pushpophelper(LyXLex & lexrc, keyword_item * i, int s) : lex(lexrc) {
                lex.pushTable(i, s);
@@ -161,4 +192,7 @@ struct pushpophelper {
 #define pushpophelper(x, y, z) unnamed_pushpophelper;
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
+
+} // namespace lyx
+
 #endif