Fix event loop to no longer eat CPU

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 9825fc962ed05e7b574e2327d2e91c27f78ff756..dc16b52b1a7a7a19c3f1764d72dbb123e70c02fa 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -1,27 +1,34 @@
 // -*- C++ -*-
+/**
+ * \file lyxlex.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 //  Generalized simple lexical analizer.
 //  It can be used for simple syntax parsers, like lyxrc,
-//  texclass and others to come.   [asierra30/03/96]
-//
-//   Copyright 1996 Lyx Team.
+//  texclass and others to come.
+
 #ifndef LYXLEX_H
 #define LYXLEX_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <boost/utility.hpp>
 
 #include <iosfwd>
+#include <string>
 
-#include "LString.h"
-#include "support/utility.hpp"
 
 ///
 struct keyword_item {
        ///
        char const * tag;
        ///
-       short code;
+       int code;
 };
 
 /** Generalized simple lexical analizer.
@@ -29,13 +36,13 @@ struct keyword_item {
     texclass and others to come.
     @see lyxrc.C for an example of usage.
   */
-class LyXLex : public noncopyable { 
+class LyXLex : boost::noncopyable {
 public:
        ///
-       LyXLex (keyword_item *, int);
+       LyXLex(keyword_item *, int);
        ///
        ~LyXLex();
-       
+
        /// Lex basic codes
        enum {
                ///
@@ -48,17 +55,23 @@ public:
                LEX_TOKEN = -4
        };
 
-       /// file is open and end of file is not reached
-       bool IsOK() const;
+       /// 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 & i);
+       void setStream(std::istream & is);
        ///
        std::istream & getStream();
        /// Danger! Don't use it unless you know what you are doing.
        void setLineNo(int l);
-       
+       /// Change the character that begins a comment. Default is '#'
+       void setCommentChar(char c);
+
        /// returns a lex code
        int lex();
 
@@ -73,20 +86,20 @@ public:
        */
        bool nextToken();
        /// Push a token, that next token got from lyxlex.
-       void pushToken(string const &);
-       
-       /// 
-       int GetLineNo() const;
-       
+       void pushToken(std::string const &);
+
+       ///
+       int getLineNo() const;
+
        ///
-       int GetInteger() const;
+       int getInteger() const;
        ///
-       bool GetBool() const;
+       bool getBool() const;
        ///
-       float GetFloat() const;
+       double 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
            serves as a template for how many spaces the lines
@@ -94,22 +107,14 @@ public:
            each following line. This mechanism does not work
            perfectly if you use tabs.
        */
-       string const getLongString(string const & endtag);
-       
-       ///
-       bool EatLine();
-       ///
-       int FindToken(char const * str[]);
-       ///
-       int CheckToken(char const * str[], int print_error);
+       std::string const getLongString(std::string const & endtag);
 
        ///
-       char const * const text() const;
+       bool eatLine();
 
-       /** 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
            on top of the stack.
        */
@@ -119,32 +124,46 @@ 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 double
+       LyXLex & operator>>(double &);
+       /// extract integer
+       LyXLex & operator>>(int &);
+       /// extract unsigned integer
+       LyXLex & operator>>(unsigned int &);
+       /// extract bool
+       LyXLex & operator>>(bool &);
+
 private:
-       struct Pimpl;
+       class Pimpl;
        ///
        Pimpl * pimpl_;
 };
 
 
-/** Use to enable multipe exit points.
+/** Use to enable multiple exit points.
     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);
        }
+       ///
        ~pushpophelper() {
                lex.popTable();
        }
+       ///
        LyXLex & lex;
 };
 /** Avoid wrong usage of pushpophelper.