wpp: ignore spaces after comments

Dimitrie O. Paun dpaun at rogers.com
Sat Jan 4 09:12:06 CST 2003


Wpp blew up on any statement that had a comment at the
end of the line followed by spaces. Not Good. For
example:

#ifdef  UNICODE
#define __TEXT(quote) L##quote
#else   /* UNICODE */         
#define __TEXT(quote) quote
#endif /* UNICODE */         
#define TEXT(quote) __TEXT(quote)

would blow numerous chunks.

ChangeLog
  Eat any whitespace following a comment.

Index: tools/wpp/ppl.l
===================================================================
RCS file: /var/cvs/wine/tools/wpp/ppl.l,v
retrieving revision 1.1
diff -u -r1.1 ppl.l
--- tools/wpp/ppl.l	16 Jul 2002 02:33:11 -0000	1.1
+++ tools/wpp/ppl.l	4 Jan 2003 14:57:47 -0000
@@ -517,7 +517,7 @@
 <INITIAL,pp_pp,pp_ignore,pp_eol,pp_inc,pp_if,pp_ifd,pp_defined,pp_def,pp_define,pp_macro,pp_mbody,RCINCL>"/*" yy_push_state(pp_comment);
 <pp_comment>[^*\n]*|"*"+[^*/\n]*	;
 <pp_comment>\n				newline(0);
-<pp_comment>"*"+"/"			yy_pop_state();
+<pp_comment>"*"+"/"{ws}*		yy_pop_state();
 
 	/*
 	 * Remove C++ style comment (almost all start-conditions)


-- 
Dimi.




More information about the wine-patches mailing list