Date: Fri, 18 Jun 2010 16:07:25 +0000 (UTC) From: Alexander Kabaev <kan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209305 - head/cddl/contrib/opensolaris/lib/libdtrace/common Message-ID: <201006181607.o5IG7PjF005199@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kan Date: Fri Jun 18 16:07:24 2010 New Revision: 209305 URL: http://svn.freebsd.org/changeset/base/209305 Log: Do not allow EOF token to be put back into input buffer. This reimplements previous change from r20930 in more generic way. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri Jun 18 15:25:57 2010 (r209304) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri Jun 18 16:07:24 2010 (r209305) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006181607.o5IG7PjF005199>