From 3fecf9ddcd5dd8ac8d3b48106e8eab7e3e303371 Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Mon, 18 Jan 2010 22:15:09 +0000 Subject: [PATCH] wpp: Fix expansion of macro bodies following the parsing of a numerical digit. The current regular expression causes all letters and spaces (among other characters) following the appearance of a digit to be classed as a literal, including C identifiers which may need to be expanded. The expression was intended to catch the remaining characters that were not covered by the first two rules ([^a-zA-Z0-9'"#/\\\n]+ and {cident}), but the [^'"#/\\\n] expression caught {cident} as well. While one solution would have been just to catch the expression that match [a-zA-Z0-9]* that don't match {cident}, i.e. [0-9][a-zA-Z0-9]*, in the interests of avoiding unnecessary multiple LITERALs being generated and then combined during parsing the expression also includes the first expression, making it [0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]*. --- libs/wpp/ppl.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 1ce98fb75af..06a4f18df2b 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -527,7 +527,7 @@ void pp_writestring(const char *format, ...) {cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; \#\# return tCONCAT; \# return tSTRINGIZE; -[0-9][^'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; +[0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; (\\\r?)|(\/[^/*'"#\\\n]*) ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; \\\r?\n{ws}+ newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; \\\r?\n newline(0);