Fixed handling of cyclic defines.

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index a56c215ab455dbf98af7d765031ba02801c9dc25..9d203db22b05a42b2111646e699a2973de203920 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -103,9 +103,10 @@ add_preprocessor_define(char *define)
        else
        {
                defines->old = define_copy;
-               defines->new = mm_strdup("");
+               defines->new = mm_strdup("1");
        }
        defines->pertinent = true;
+       defines->used = NULL;
        defines->next = pd;
 }
 

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index e6a8e91dae5d47f44e961b9678a60496da9d7f48..ad66311b147d9202def4b97f8be89dd9560cec90 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -550,7 +550,7 @@ cppline                     {space}*#(.*\\{space})+.*
                                                /* How about a DEFINE? */
                                                for (ptr = defines; ptr; ptr = ptr->next)
                                                {
-                                                       if (strcmp(yytext, ptr->old) == 0)
+                                                       if (strcmp(yytext, ptr->old) == 0 && ptr->used == NULL)
                                                        {
                                                                struct _yy_buffer *yb;
 
@@ -559,7 +559,7 @@ cppline                     {space}*#(.*\\{space})+.*
                                                                yb->buffer =  YY_CURRENT_BUFFER;
                                                                yb->lineno = yylineno;
                                                                yb->filename = mm_strdup(input_filename);
-                                                               yb->next = yy_buffer;
+                                                               ptr->used = yb->next = yy_buffer;
 
                                                                yy_buffer = yb;
 
@@ -648,7 +648,7 @@ cppline                     {space}*#(.*\\{space})+.*
                                                /* is it a define? */
                                                for (ptr = defines; ptr; ptr = ptr->next)
                                                {
-                                                       if (strcmp(yytext, ptr->old) == 0)
+                                                       if (strcmp(yytext, ptr->old) == 0 && ptr->used == NULL)
                                                        {
                                                                struct _yy_buffer *yb;
 
@@ -657,7 +657,7 @@ cppline                     {space}*#(.*\\{space})+.*
                                                                yb->buffer =  YY_CURRENT_BUFFER;
                                                                yb->lineno = yylineno;
                                                                yb->filename = mm_strdup(input_filename);
-                                                               yb->next = yy_buffer;
+                                                               ptr->used = yb->next = yy_buffer;
 
                                                                yy_buffer = yb;
 
@@ -687,7 +687,7 @@ cppline                     {space}*#(.*\\{space})+.*
 <C>"-"                         { return('-'); }
 <C>"("                         { return('('); }
 <C>")"                         { return(')'); }
-<C>{space}                     { ECHO; }
+<C,xskip>{space}               { ECHO; }
 <C>\{                          { return('{'); }
 <C>\}                          { return('}'); }
 <C>\[                          { return('['); }
@@ -923,12 +923,13 @@ cppline                   {space}*#(.*\\{space})+.*
                                                }
                                                if (ptr == NULL)
                                                {
-                                                                                               this = (struct _defines *) mm_alloc(sizeof(struct _defines));
+                                                       this = (struct _defines *) mm_alloc(sizeof(struct _defines));
 
-                                                                                               /* initial definition */
-                                                                                               this->old = old;
-                                                                                               this->new = mm_strdup(literalbuf);
+                                                       /* initial definition */
+                                                       this->old = old;
+                                                       this->new = mm_strdup(literalbuf);
                                                        this->next = defines;
+                                                       this->used = NULL;
                                                        defines = this;
                                                }
 
@@ -953,7 +954,15 @@ cppline                    {space}*#(.*\\{space})+.*
                                                {
                                                        struct _yy_buffer *yb = yy_buffer;
                                                        int i;
-
+                                                       struct _defines *ptr;
+
+                                                       for (ptr = defines; ptr; ptr = ptr->next)
+                                                               if (ptr->used == yy_buffer)
+                                                               {
+                                                                       ptr->used = NULL;
+                                                                       break;
+                                                               }
+                                                       
                                                        if (yyin != NULL)
                                                                fclose(yyin);
 

diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
index 4091a562ab42ffb06bdab96dbc8a93f1c4125cc7..1d34a7c9ec533f42fe5cfbef3009b8b553a789e3 100644 (file)
--- a/src/interfaces/ecpg/preproc/type.h
+++ b/src/interfaces/ecpg/preproc/type.h
@@ -134,6 +134,7 @@ struct _defines
        char            *old;
        char            *new;
        int             pertinent;
+       void            *used;
        struct _defines *next;
 };