diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/ChangeLog | 1 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 20 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index 42173f76ab8..8c1f9817e6b 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -1509,6 +1509,7 @@ Fri Jun 20 13:23:07 CEST 2003 Fri Jun 20 15:34:29 CEST 2003 - For Informix compatibility we have to accept a "free <cursor>". + - Synced scan.l and pgc.l. - Set ecpg version to 3.0.0 - Set ecpg library to 4.0.0 - Set pgtypes library to 1.0.0 diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index b70025065f6..f4a1f6cbfd0 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.116 2003/06/17 07:28:22 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.117 2003/06/20 15:16:06 meskes Exp $ * *------------------------------------------------------------------------- */ @@ -179,12 +179,12 @@ xcstop \*+\/ xcinside [^*/]+ digit [0-9] -letter [\200-\377_A-Za-z] -letter_or_digit [\200-\377_A-Za-z0-9] +ident_start [A-Za-z\200-\377_] +ident_cont [A-Za-z\200-\377_0-9\$] -identifier {letter}{letter_or_digit}* +identifier {ident_start}{ident_cont}* -array ({letter_or_digit}|[\+\-\*\%\/\(\)])* +array ({ident_cont}|[\+\-\*\%\/\(\)])* typecast "::" /* @@ -197,8 +197,8 @@ typecast "::" * If you change either set, adjust the character lists appearing in the * rule for "operator"! */ -self [,()\[\].;$\:\+\-\*\/\%\^\<\>\=] -op_chars [\~\!\@\#\^\&\|\`\?\$\+\-\*\/\%\<\>\=] +self [,()\[\].;\:\+\-\*\/\%\^\<\>\=] +op_chars [\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=] operator {op_chars}+ /* we no longer allow unary minus in numbers. @@ -474,7 +474,7 @@ cppline {space}*#(.*\\{space})+.* for (ic = nchars-2; ic >= 0; ic--) { - if (strchr("~!@#^&|`?$%", yytext[ic])) + if (strchr("~!@#^&|`?%", yytext[ic])) break; } if (ic >= 0) @@ -493,7 +493,7 @@ cppline {space}*#(.*\\{space})+.* * that the "self" rule would have. */ if (nchars == 1 && - strchr(",()[].;$:+-*/%^<>=", yytext[0])) + strchr(",()[].;:+-*/%^<>=", yytext[0])) return yytext[0]; } @@ -862,7 +862,7 @@ cppline {space}*#(.*\\{space})+.* else BEGIN(xskip); } -<C,xskip>{informix_special}{endif}{space}* { +<C,xskip>{informix_special}{endif}{space}*";" { /* are we simulating Informix? */ if (compat == ECPG_COMPAT_INFORMIX) { |