# HG changeset patch # User John W. Eaton # Date 1361897279 18000 # Node ID 771186909285aa8d216ab1a6b2e6e72bb3c2c026 # Parent 67f71e2a619033632fd2afd5c16497d724a9d80e maint: move class definition in lex.ll * lex.ll: Move flex_stream_reader definition just before lexical_feedback member functions. diff -r 67f71e2a6190 -r 771186909285 libinterp/parse-tree/lex.ll --- a/libinterp/parse-tree/lex.ll Tue Feb 26 11:23:04 2013 -0500 +++ b/libinterp/parse-tree/lex.ll Tue Feb 26 11:47:59 2013 -0500 @@ -1233,30 +1233,6 @@ delete_buffer (static_cast (buf)); } -class -flex_stream_reader : public stream_reader -{ -public: - flex_stream_reader (lexical_feedback *l, char *buf_arg) - : lexer (l), stream_reader (), buf (buf_arg) - { } - - int getc (void) { return lexer->text_yyinput (); } - int ungetc (int c) { lexer->xunput (c, buf); return 0; } - -private: - - // No copying! - - flex_stream_reader (const flex_stream_reader&); - - flex_stream_reader& operator = (const flex_stream_reader&); - - lexical_feedback *lexer; - - char *buf; -}; - // Return 1 if the given character matches any character in the given // string. @@ -1652,6 +1628,30 @@ return retval; } +class +flex_stream_reader : public stream_reader +{ +public: + flex_stream_reader (lexical_feedback *l, char *buf_arg) + : stream_reader (), lexer (l), buf (buf_arg) + { } + + int getc (void) { return lexer->text_yyinput (); } + int ungetc (int c) { lexer->xunput (c, buf); return 0; } + +private: + + // No copying! + + flex_stream_reader (const flex_stream_reader&); + + flex_stream_reader& operator = (const flex_stream_reader&); + + lexical_feedback *lexer; + + char *buf; +}; + lexical_feedback::~lexical_feedback (void) { // Clear out the stack of token info used to track line and