database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Distinguish between C and SQL mode for C-style comments.

Browse Source 
SQL standard asks for allowing nested comments, while C does not. Therefore the
two comments, while mostly similar, have to be parsed seperately.
This commit is contained in:
Michael Meskes 2013-11-24 12:26:00 +01:00
parent 64d15e4240
commit 8ac5e88f9f
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/interfaces/ecpg/preproc/pgc.l
View File

@ -102,7 +102,8 @@ static struct _if_value
* and to eliminate parsing troubles for numeric strings. * and to eliminate parsing troubles for numeric strings.
* Exclusive states: * Exclusive states:
* <xb> bit string literal * <xb> bit string literal
* <xc> extended C-style comments - thomas 1997-07-12 * <xcc> extended C-style comments in C
* <xcsql> extended C-style comments in SQL
* <xd> delimited identifiers (double-quoted identifiers) - thomas 1997-10-27 * <xd> delimited identifiers (double-quoted identifiers) - thomas 1997-10-27
* <xh> hexadecimal numeric string - thomas 1997-11-16 * <xh> hexadecimal numeric string - thomas 1997-11-16
* <xq> standard quoted strings - thomas 1997-07-30 * <xq> standard quoted strings - thomas 1997-07-30
@ -115,7 +116,8 @@ static struct _if_value
*/ */
%x xb %x xb
%x xc %x xcc
%x xcsql
%x xd %x xd
%x xdc %x xdc
%x xh %x xh
@ -369,23 +371,32 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.
<SQL>{whitespace} { /* ignore */ } <SQL>{whitespace} { /* ignore */ }
<C,SQL>{xcstart} { <C>{xcstart} {
token_start = yytext; token_start = yytext;
state_before = YYSTATE; state_before = YYSTATE;
xcdepth = 0; xcdepth = 0;
BEGIN(xc); BEGIN(xcc);
/* Put back any characters past slash-star; see above */ /* Put back any characters past slash-star; see above */
yyless(2); yyless(2);
fputs("/*", yyout); fputs("/*", yyout);
} }
<xc>{xcstart} { <SQL>{xcstart} {
token_start = yytext;
state_before = YYSTATE;
xcdepth = 0;
BEGIN(xcsql);
/* Put back any characters past slash-star; see above */
yyless(2);
fputs("/*", yyout);
}
<xcc>{xcstart} { ECHO; }
<xcsql>{xcstart} {
xcdepth++; xcdepth++;
/* Put back any characters past slash-star; see above */ /* Put back any characters past slash-star; see above */
yyless(2); yyless(2);
fputs("/*", yyout); fputs("/*", yyout);
} }
<xcsql>{xcstop} {
<xc>{xcstop} {
ECHO; ECHO;
if (xcdepth <= 0) if (xcdepth <= 0)
{ {
@ -395,12 +406,16 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.
else else
xcdepth--; xcdepth--;
} }
<xcc>{xcstop} {
ECHO;
BEGIN(state_before);
token_start = NULL;
}
<xcc,xcsql>{xcinside} { ECHO; }
<xcc,xcsql>{op_chars} { ECHO; }
<xcc,xcsql>\*+ { ECHO; }
<xc>{xcinside} { ECHO; } <xcc,xcsql><<EOF>> { mmfatal(PARSE_ERROR, "unterminated /* comment"); }
<xc>{op_chars} { ECHO; }
<xc>\*+ { ECHO; }
<xc><<EOF>> { mmfatal(PARSE_ERROR, "unterminated /* comment"); }
<SQL>{xbstart} { <SQL>{xbstart} {
token_start = yytext; token_start = yytext;