Thread: Fw: pgc.l modif. has been overwritten again
----- Original Message -----
From: Nicolas Bazin
Sent: Wednesday, March 27, 2002 4:03 PM
Subject: pgc.l modif. has been overwritten again
We need a little bit of order when several people can commit on the source code, It would be nice that they update their local copy and then commit, or check the directory or check for conflicts.
It's the second time that this modif has been overwritten. It's getting anoying.
The patch corrects a test on defines end of visibility that is performed too early by the preprocessor.
Here it is again.
*** pgc.l Wed Mar 27 15:52:45 2002
--- cvs/src/interfaces/ecpg/preproc/pgc.l Fri Feb 15 17:46:57 2002
***************
*** 859,866 ****
}
<<EOF>> {
-
- if (yy_buffer == NULL) {
if ( preproc_tos > 0 ) {
preproc_tos = 0;
--- 859,864 ----
}
<<EOF>> {
if ( preproc_tos > 0 ) {
preproc_tos = 0;
***************
*** 866,871 ****
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
yyterminate();
}
else
--- 864,871 ----
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
+
+ if (yy_buffer == NULL)
yyterminate();
else
{
***************
*** 867,873 ****
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
yyterminate();
- }
else
{
struct _yy_buffer *yb = yy_buffer;
--- 867,872 ----
if (yy_buffer == NULL)
yyterminate();
else
{
struct _yy_buffer *yb = yy_buffer;
--- cvs/src/interfaces/ecpg/preproc/pgc.l Fri Feb 15 17:46:57 2002
***************
*** 859,866 ****
}
<<EOF>> {
-
- if (yy_buffer == NULL) {
if ( preproc_tos > 0 ) {
preproc_tos = 0;
--- 859,864 ----
}
<<EOF>> {
if ( preproc_tos > 0 ) {
preproc_tos = 0;
***************
*** 866,871 ****
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
yyterminate();
}
else
--- 864,871 ----
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
+
+ if (yy_buffer == NULL)
yyterminate();
else
{
***************
*** 867,873 ****
mmerror(PARSE_ERROR, ET_FATAL, "Missing 'EXEC SQL ENDIF;'");
}
yyterminate();
- }
else
{
struct _yy_buffer *yb = yy_buffer;
--- 867,872 ----
if (yy_buffer == NULL)
yyterminate();
else
{
struct _yy_buffer *yb = yy_buffer;
Nicolas.