postgres
diff --git a/‎doc/src/sgml/ecpg.sgml
Copy file name to clipboardExpand all lines: doc/src/sgml/ecpg.sgml
+4-2Lines changed: 4 additions & 2 deletions b/‎doc/src/sgml/ecpg.sgml
Copy file name to clipboardExpand all lines: doc/src/sgml/ecpg.sgml
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎src/interfaces/ecpg/preproc/pgc.l
Copy file name to clipboardExpand all lines: src/interfaces/ecpg/preproc/pgc.l
+6-2Lines changed: 6 additions & 2 deletions b/‎src/interfaces/ecpg/preproc/pgc.l
Copy file name to clipboardExpand all lines: src/interfaces/ecpg/preproc/pgc.l
+6-2Lines changed: 6 additions & 2 deletions
@@ -64,8 +64,10 @@ EXEC SQL ...;
    These statements syntactically take the place of a C statement.
    Depending on the particular statement, they can appear at the
    global level or within a function.  Embedded
-   <acronym>SQL</acronym> statements follow the case-sensitivity rules
-   of normal <acronym>SQL</acronym> code, and not those of C.
+   <acronym>SQL</acronym> statements follow the case-sensitivity rules of
+   normal <acronym>SQL</acronym> code, and not those of C. Also they allow nested
+   C-style comments that are part of the SQL standard. The C part of the
+   program, however, follows the C standard of not accepting nested comments.
   </para>
 
   <para>
 
@@ -394,17 +394,20 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.
 					xcdepth++;
 					/* Put back any characters past slash-star; see above */
 					yyless(2);
-					fputs("/*", yyout);
+					fputs("/_*", yyout);
 				}
 <xcsql>{xcstop}	{
-					ECHO;
 					if (xcdepth <= 0)
 					{
+						ECHO;
 						BEGIN(state_before);
 						token_start = NULL;
 					}
 					else
+					{
 						xcdepth--;
+						fputs("*_/", yyout);
+					}
 				}
 <xcc>{xcstop}	{
 					ECHO;
@@ -861,6 +864,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.
 							}
 						}
 					}
+<C>{xcstop}			{ mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }
 <C>":"				{ return(':'); }
 <C>";"				{ return(';'); }
 <C>","				{ return(','); }
Original file line number	Diff line number	Diff line change
`@@ -394,17 +394,20 @@ cppline {space}#([^i][A-Za-z]\|{if}\|{ifdef}\|{ifndef}\|{import})(.\\{space}).`
`394`	`394`	`xcdepth++;`
`395`	`395`	`/* Put back any characters past slash-star; see above */`
`396`	`396`	`yyless(2);`
`397`		`- fputs("/*", yyout);`
	`397`	`+ fputs("/_*", yyout);`
`398`	`398`	`}`
`399`	`399`	`<xcsql>{xcstop} {`
`400`		`- ECHO;`
`401`	`400`	`if (xcdepth <= 0)`
`402`	`401`	`{`
	`402`	`+ ECHO;`
`403`	`403`	`BEGIN(state_before);`
`404`	`404`	`token_start = NULL;`
`405`	`405`	`}`
`406`	`406`	`else`
	`407`	`+ {`
`407`	`408`	`xcdepth--;`
	`409`	`+ fputs("*_/", yyout);`
	`410`	`+ }`
`408`	`411`	`}`
`409`	`412`	`<xcc>{xcstop} {`
`410`	`413`	`ECHO;`
`@@ -861,6 +864,7 @@ cppline {space}#([^i][A-Za-z]\|{if}\|{ifdef}\|{ifndef}\|{import})(.\\{space}).`
`861`	`864`	`}`
`862`	`865`	`}`
`863`	`866`	`}`
	`867`	`+<C>{xcstop} { mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }`
`864`	`868`	`<C>":" { return(':'); }`
`865`	`869`	`<C>";" { return(';'); }`
`866`	`870`	`<C>"," { return(','); }`