Catch malformed include directives (PR#100)

This commit is contained in:
steve 2001-01-20 03:10:35 +00:00
parent a4de0af79d
commit 2b11f78d63
1 changed files with 13 additions and 1 deletions

View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: lexor.lex,v 1.21 2000/09/13 22:33:13 steve Exp $" #ident "$Id: lexor.lex,v 1.22 2001/01/20 03:10:35 steve Exp $"
#endif #endif
# include <stdio.h> # include <stdio.h>
@ -85,6 +85,7 @@ static int comment_enter = 0;
%x PPDEFINE %x PPDEFINE
%x CCOMMENT %x CCOMMENT
%x CSTRING %x CSTRING
%x ERROR_LINE
%x IFDEF_FALSE %x IFDEF_FALSE
%s IFDEF_TRUE %s IFDEF_TRUE
@ -136,6 +137,14 @@ W [ \t\b\f]+
<PPINCLUDE>\n\r { istack->lineno += 1; yy_pop_state(); do_include(); } <PPINCLUDE>\n\r { istack->lineno += 1; yy_pop_state(); do_include(); }
<PPINCLUDE><<EOF>> { istack->lineno += 1; yy_pop_state(); do_include(); } <PPINCLUDE><<EOF>> { istack->lineno += 1; yy_pop_state(); do_include(); }
/* Anything that is not matched by the above is an error of some
sort. Print and error message and absorb the rest of the line. */
<PPINCLUDE>. {
fprintf(stderr, "%s:%u: error: malformed `include directive."
" Did you quote the file name?\n", istack->path,
istack->lineno+1);
error_count += 1;
BEGIN(ERROR_LINE); }
/* Detect the define directive, and match the name. Match any /* Detect the define directive, and match the name. Match any
white space that might be found, as well. After I get the white space that might be found, as well. After I get the
@ -208,6 +217,9 @@ W [ \t\b\f]+
. { ECHO; } . { ECHO; }
\n { istack->lineno += 1; ECHO; } \n { istack->lineno += 1; ECHO; }
/* Absorb the rest of the line when a broken directive is detected. */
<ERROR_LINE>.* { yy_pop_state(); }
%% %%
/* Defined macros are kept in this table for convenient lookup. As /* Defined macros are kept in this table for convenient lookup. As
`define directives are matched (and the do_define() function `define directives are matched (and the do_define() function