reverse last change

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 9825fc962ed05e7b574e2327d2e91c27f78ff756..143a88d087547bf7e04d0dc7560ec3b01ccab01c 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -14,14 +14,14 @@
 #include <iosfwd>
 
 #include "LString.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 ///
 struct keyword_item {
        ///
        char const * tag;
        ///
-       short code;
+       int code;
 };
 
 /** Generalized simple lexical analizer.
@@ -29,13 +29,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();
-       
+
        /// Lex basic codes
        enum {
                ///
@@ -49,7 +49,7 @@ public:
        };
 
        /// file is open and end of file is not reached
-       bool IsOK() const;
+       bool isOK() const;
        /// return true if able to open file, else false
        bool setFile(string const & filename);
        ///
@@ -58,7 +58,9 @@ public:
        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();
 
@@ -74,19 +76,19 @@ public:
        bool nextToken();
        /// Push a token, that next token got from lyxlex.
        void pushToken(string const &);
-       
-       /// 
-       int GetLineNo() const;
-       
+
        ///
-       int GetInteger() const;
+       int getLineNo() const;
+
+       ///
+       int getInteger() const;
        ///
-       bool GetBool() const;
+       bool getBool() const;
        ///
-       float GetFloat() const;
+       float getFloat() const;
        ///
-       string const GetString() const;
-       
+       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
@@ -95,21 +97,19 @@ public:
            perfectly if you use tabs.
        */
        string const getLongString(string const & endtag);
-       
-       ///
-       bool EatLine();
+
        ///
-       int FindToken(char const * str[]);
+       bool eatLine();
        ///
-       int CheckToken(char const * str[], int print_error);
+       int findToken(char const * str[]);
 
        ///
-       char const * const text() const;
+       string const text() const;
 
        /** 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.
        */
@@ -132,19 +132,22 @@ private:
 };
 
 
-/** 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
 */
 struct pushpophelper {
+       ///
        pushpophelper(LyXLex & lexrc, keyword_item * i, int s) : lex(lexrc) {
                lex.pushTable(i, s);
        }
+       ///
        ~pushpophelper() {
                lex.popTable();
        }
+       ///
        LyXLex & lex;
 };
 /** Avoid wrong usage of pushpophelper.