postgres.git / summary / log / commit / refs

commit    fc1ae7d2eb6a3de47f5f5cd6ebf2d18d226b8036
Author:   Michael Meskes <meskes@postgresql.org>
Date:     Tue Feb 16 13:23:50 2016 +0000

    Change ecpg lexer to accept comments with line breaks in CPP lines.


 src/interfaces/ecpg/preproc/pgc.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index ede45170821..397f14ef26f 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -354,7 +354,7 @@ cppinclude_next		{space}*#{include_next}{space}*
 /* first a general line for all commands not starting with "i" */
 /* and then the other commands starting with "i", we have to add these
  * separately because the cppline production would match on "include" too */
-cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.*{newline}
+cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+\/)|.)*{newline}
 
 /*
  * Dollar quoted strings are totally opaque, and no escaping is done on them.


[parent: bdc309c7dc84]