X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=1f63abc1115d7fcaa4e93306eb16c7a54e78fce4;hb=98c966c64594611e469313314abd1e59524adb4a;hp=0acc50974d2b92d6a82a4fd7fa3fd690bf269651;hpb=eeaae9c35568b8852210420c727068a872ba3071;p=lyx.git diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h index 0acc50974d..1f63abc111 100644 --- a/src/lyxlex_pimpl.h +++ b/src/lyxlex_pimpl.h @@ -5,6 +5,7 @@ #include #include +#include #include "lyxlex.h" @@ -13,17 +14,17 @@ #endif /// -struct LyXLex::Pimpl : public noncopyable { +struct LyXLex::Pimpl : boost::noncopyable { /// enum { /// LEX_MAX_BUFF = 2048 }; - + /// Pimpl(keyword_item * tab, int num); /// - string const GetString() const; + string const getString() const; /// void printError(string const & message) const; /// @@ -37,13 +38,15 @@ struct LyXLex::Pimpl : public noncopyable { /// void setStream(std::istream & i); /// + void setCommentChar(char c); + /// bool next(bool esc = false); /// int search_kw(char const * const tag) const; /// int lex(); /// - bool EatLine(); + bool eatLine(); /// bool nextToken(); /// @@ -52,7 +55,7 @@ struct LyXLex::Pimpl : public noncopyable { std::filebuf fb__; /// the stream that we use. std::istream is; - /// + /// string name; /// keyword_item * table; @@ -61,11 +64,13 @@ struct LyXLex::Pimpl : public noncopyable { /// char buff[LEX_MAX_BUFF]; /// - short status; + int status; /// int lineno; /// string pushTok; + /// + char commentChar; private: /// void verifyTable();