From 81db7fa24d27c85e8e820be6d2d369ddbd124a09 Mon Sep 17 00:00:00 2001 From: Andreas Meyer Date: Thu, 30 Nov 2006 16:43:51 +0000 Subject: [PATCH] added "support" for recent versions of flex (just replaced unput by yyunput .. other workarounds did not quite work) --- Manual_tools/src/lexer.lex | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Manual_tools/src/lexer.lex b/Manual_tools/src/lexer.lex index 31f42bd1b30..83bc3f4875c 100644 --- a/Manual_tools/src/lexer.lex +++ b/Manual_tools/src/lexer.lex @@ -974,7 +974,7 @@ bool skipspaces_eof() { printErrorMessage( EOFInMacroExpansionError); return true; } - unput( c); + yyunput( c, yytext ); return false; } @@ -988,7 +988,7 @@ bool skipseparator_eof() { printErrorMessage( EOFInMacroExpansionError); return true; } - unput( c); + yyunput( c, yytext ); return false; } @@ -1001,8 +1001,8 @@ bool skiplimitedspaces_eof() { while( c != EOF && isspace(c) && c != SEPARATOR) { if ( c == '\n') { if ( nl_count > 0) { - unput( c); - unput( c); + yyunput( c, yytext ); + yyunput( c, yytext ); return false; } else nl_count++; @@ -1015,7 +1015,7 @@ bool skiplimitedspaces_eof() { printErrorMessage( EOFInMacroExpansionError); return true; } - unput( c); + yyunput( c, yytext ); return false; } @@ -1027,8 +1027,8 @@ int skiplimitedspaces_param() { while( c != EOF && isspace(c) && c != SEPARATOR) { if ( c == '\n') { if ( nl_count > 0) { - unput( c); - unput( c); + yyunput( c, yytext ); + yyunput( c, yytext ); return '\n'; } else nl_count++; @@ -1041,7 +1041,7 @@ int skiplimitedspaces_param() { printErrorMessage( EOFInMacroExpansionError); return c; } - unput( c); + yyunput( c, yytext ); return c; } @@ -1054,8 +1054,8 @@ bool skiplimitedsepspaces_eof() { while( c != EOF && (isspace(c) || c == SEPARATOR)) { if ( c == '\n') { if ( nl_count > 0) { - unput( c); - unput( c); + yyunput( c, yytext ); + yyunput( c, yytext ); return false; } else nl_count++; @@ -1068,7 +1068,7 @@ bool skiplimitedsepspaces_eof() { printErrorMessage( EOFInMacroExpansionError); return true; } - unput( c); + yyunput( c, yytext ); return false; } @@ -1082,7 +1082,7 @@ bool skipnonspaces_eof() { printErrorMessage( EOFInMacroExpansionError); return true; } - unput( c); + yyunput( c, yytext ); return false; } @@ -1195,7 +1195,7 @@ bool expand_macro() { BeginParameterMode(); } else { if (c != EOF) - unput( c); + yyunput( c, yytext ); include_stack.push_string( s + " in " + item.filename, item.body, item.line); }