d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not allow EOF token to be put back into input buffer.

Browse Source 
This reimplements previous change from r20930 in more generic way.

MFC after:	1 week
This commit is contained in:
Alexander Kabaev 2010-06-18 16:07:24 +00:00
parent c8812077bf
commit 283bcf71ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209305
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
View File

@ -45,7 +45,7 @@
#undef input
#undef unput
#else
/*
/*
* Define YY_INPUT for flex since input() can't be re-defined.
*/
#define YY_INPUT(buf,result,max_size) \
@ -60,6 +60,15 @@
buf[n] = *yypcb->pcb_strptr++; \
result = n; \
}
/*
* Do not EOF let tokens to be put back. This does not work with flex.
* On the other hand, leaving current buffer in same state it was when
* last EOF was received guarantees that input() will keep returning EOF
* for all subsequent invocations, which is the effect desired.
*/
#undef unput
#define unput(c) \
if (c != EOF) yyunput( c, yytext_ptr )
#endif
static int id_or_type(const char *);
@ -811,8 +820,7 @@ id_or_type(const char *s)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
}
if (c0 != EOF)
unput(c0);
unput(c0);
return (ttok);
}