Fix C++ incompatibilities in ecpg/preproc/ header files.

tglsfdc · tglsfdc · commit 4f67858d3f21 · 2019-05-31T12:38:53.000-04:00
There's probably no need to back-patch this, since it seems unlikely that anybody would be inserting C++ code into ecpg's preprocessor. Discussion: https://postgr.es/m/b517ec3918d645eb950505eac8dd434e@gaz-is.ru
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
@@ -99,13 +99,13 @@ add_preprocessor_define(char *define)
 		/* symbol has a value */
 		for (tmp = ptr - 1; *tmp == ' '; tmp--);
 		tmp[1] = '\0';
-		defines->old = define_copy;
-		defines->new = ptr + 1;
+		defines->olddef = define_copy;
+		defines->newdef = ptr + 1;
 	}
 	else
 	{
-		defines->old = define_copy;
-		defines->new = mm_strdup("1");
+		defines->olddef = define_copy;
+		defines->newdef = mm_strdup("1");
 	}
 	defines->pertinent = true;
 	defines->used = NULL;
@@ -410,8 +410,8 @@ main(int argc, char *const argv[])
 					defptr = defines;
 					defines = defines->next;
 
-					free(defptr->new);
-					free(defptr->old);
+					free(defptr->newdef);
+					free(defptr->olddef);
 					free(defptr);
 				}
 
@@ -423,8 +423,8 @@ main(int argc, char *const argv[])
 					{
 						defptr->next = this->next;
 
-						free(this->new);
-						free(this->old);
+						free(this->newdef);
+						free(this->olddef);
 						free(this);
 					}
 				}
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -1114,14 +1114,14 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 
 					for (ptr = defines; ptr != NULL; ptr2 = ptr, ptr = ptr->next)
 					{
-						if (strcmp(yytext, ptr->old) == 0)
+						if (strcmp(yytext, ptr->olddef) == 0)
 						{
 							if (ptr2 == NULL)
 								defines = ptr->next;
 							else
 								ptr2->next = ptr->next;
-							free(ptr->new);
-							free(ptr->old);
+							free(ptr->newdef);
+							free(ptr->olddef);
 							free(ptr);
 							break;
 						}
@@ -1300,8 +1300,10 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						yytext[i+1] = '\0';
 
 						for (defptr = defines;
-							 defptr != NULL && strcmp(yytext, defptr->old) != 0;
-							 defptr = defptr->next);
+							 defptr != NULL &&
+							 strcmp(yytext, defptr->olddef) != 0;
+							 defptr = defptr->next)
+							/* skip */ ;
 
 						preproc_tos++;
 						stacked_if_value[preproc_tos].else_branch = false;
@@ -1333,19 +1335,19 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 
 						for (ptr = defines; ptr != NULL; ptr = ptr->next)
 						{
-							 if (strcmp(old, ptr->old) == 0)
+							 if (strcmp(old, ptr->olddef) == 0)
 							 {
-								free(ptr->new);
-								ptr->new = mm_strdup(literalbuf);
+								free(ptr->newdef);
+								ptr->newdef = mm_strdup(literalbuf);
 							 }
 						}
 						if (ptr == NULL)
 						{
 							this = (struct _defines *) mm_alloc(sizeof(struct _defines));
 
 							/* initial definition */
-							this->old = old;
-							this->new = mm_strdup(literalbuf);
+							this->olddef = old;
+							this->newdef = mm_strdup(literalbuf);
 							this->next = defines;
 							this->used = NULL;
 							defines = this;
@@ -1613,7 +1615,7 @@ static bool isdefine(void)
 	/* is it a define? */
 	for (ptr = defines; ptr; ptr = ptr->next)
 	{
-		if (strcmp(yytext, ptr->old) == 0 && ptr->used == NULL)
+		if (strcmp(yytext, ptr->olddef) == 0 && ptr->used == NULL)
 		{
 			struct _yy_buffer *yb;
 
@@ -1626,7 +1628,7 @@ static bool isdefine(void)
 
 			ptr->used = yy_buffer = yb;
 
-			yy_scan_string(ptr->new);
+			yy_scan_string(ptr->newdef);
 			return true;
 		}
 	}
diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
@@ -160,8 +160,8 @@ struct typedefs
 
 struct _defines
 {
-	char	   *old;
-	char	   *new;
+	char	   *olddef;
+	char	   *newdef;
 	int			pertinent;
 	void	   *used;
 	struct _defines *next;

Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,13 @@ add_preprocessor_define(char *define)`
`99`	`99`	`/* symbol has a value */`
`100`	`100`	`for (tmp = ptr - 1; *tmp == ' '; tmp--);`
`101`	`101`	`tmp[1] = '\0';`
`102`		`- defines->old = define_copy;`
`103`		`- defines->new = ptr + 1;`
	`102`	`+ defines->olddef = define_copy;`
	`103`	`+ defines->newdef = ptr + 1;`
`104`	`104`	`}`
`105`	`105`	`else`
`106`	`106`	`{`
`107`		`- defines->old = define_copy;`
`108`		`- defines->new = mm_strdup("1");`
	`107`	`+ defines->olddef = define_copy;`
	`108`	`+ defines->newdef = mm_strdup("1");`
`109`	`109`	`}`
`110`	`110`	`defines->pertinent = true;`
`111`	`111`	`defines->used = NULL;`
`@@ -410,8 +410,8 @@ main(int argc, char *const argv[])`
`410`	`410`	`defptr = defines;`
`411`	`411`	`defines = defines->next;`
`412`	`412`
`413`		`- free(defptr->new);`
`414`		`- free(defptr->old);`
	`413`	`+ free(defptr->newdef);`
	`414`	`+ free(defptr->olddef);`
`415`	`415`	`free(defptr);`
`416`	`416`	`}`
`417`	`417`
`@@ -423,8 +423,8 @@ main(int argc, char *const argv[])`
`423`	`423`	`{`
`424`	`424`	`defptr->next = this->next;`
`425`	`425`
`426`		`- free(this->new);`
`427`		`- free(this->old);`
	`426`	`+ free(this->newdef);`
	`427`	`+ free(this->olddef);`
`428`	`428`	`free(this);`
`429`	`429`	`}`
`430`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1114,14 +1114,14 @@ cppline {space}#([^i][A-Za-z]\|{if}\|{ifdef}\|{ifndef}\|{import})((\/\[^/]\+`
`1114`	`1114`
`1115`	`1115`	`for (ptr = defines; ptr != NULL; ptr2 = ptr, ptr = ptr->next)`
`1116`	`1116`	`{`
`1117`		`- if (strcmp(yytext, ptr->old) == 0)`
	`1117`	`+ if (strcmp(yytext, ptr->olddef) == 0)`
`1118`	`1118`	`{`
`1119`	`1119`	`if (ptr2 == NULL)`
`1120`	`1120`	`defines = ptr->next;`
`1121`	`1121`	`else`
`1122`	`1122`	`ptr2->next = ptr->next;`
`1123`		`- free(ptr->new);`
`1124`		`- free(ptr->old);`
	`1123`	`+ free(ptr->newdef);`
	`1124`	`+ free(ptr->olddef);`
`1125`	`1125`	`free(ptr);`
`1126`	`1126`	`break;`
`1127`	`1127`	`}`
`@@ -1300,8 +1300,10 @@ cppline {space}#([^i][A-Za-z]\|{if}\|{ifdef}\|{ifndef}\|{import})((\/\[^/]\+`
`1300`	`1300`	`yytext[i+1] = '\0';`
`1301`	`1301`
`1302`	`1302`	`for (defptr = defines;`
`1303`		`- defptr != NULL && strcmp(yytext, defptr->old) != 0;`
`1304`		`- defptr = defptr->next);`
	`1303`	`+ defptr != NULL &&`
	`1304`	`+ strcmp(yytext, defptr->olddef) != 0;`
	`1305`	`+ defptr = defptr->next)`
	`1306`	`+ /* skip */ ;`
`1305`	`1307`
`1306`	`1308`	`preproc_tos++;`
`1307`	`1309`	`stacked_if_value[preproc_tos].else_branch = false;`
`@@ -1333,19 +1335,19 @@ cppline {space}#([^i][A-Za-z]\|{if}\|{ifdef}\|{ifndef}\|{import})((\/\[^/]\+`
`1333`	`1335`
`1334`	`1336`	`for (ptr = defines; ptr != NULL; ptr = ptr->next)`
`1335`	`1337`	`{`
`1336`		`- if (strcmp(old, ptr->old) == 0)`
	`1338`	`+ if (strcmp(old, ptr->olddef) == 0)`
`1337`	`1339`	`{`
`1338`		`- free(ptr->new);`
`1339`		`- ptr->new = mm_strdup(literalbuf);`
	`1340`	`+ free(ptr->newdef);`
	`1341`	`+ ptr->newdef = mm_strdup(literalbuf);`
`1340`	`1342`	`}`
`1341`	`1343`	`}`
`1342`	`1344`	`if (ptr == NULL)`
`1343`	`1345`	`{`
`1344`	`1346`	`this = (struct _defines *) mm_alloc(sizeof(struct _defines));`
`1345`	`1347`
`1346`	`1348`	`/* initial definition */`
`1347`		`- this->old = old;`
`1348`		`- this->new = mm_strdup(literalbuf);`
	`1349`	`+ this->olddef = old;`
	`1350`	`+ this->newdef = mm_strdup(literalbuf);`
`1349`	`1351`	`this->next = defines;`
`1350`	`1352`	`this->used = NULL;`
`1351`	`1353`	`defines = this;`
`@@ -1613,7 +1615,7 @@ static bool isdefine(void)`
`1613`	`1615`	`/* is it a define? */`
`1614`	`1616`	`for (ptr = defines; ptr; ptr = ptr->next)`
`1615`	`1617`	`{`
`1616`		`- if (strcmp(yytext, ptr->old) == 0 && ptr->used == NULL)`
	`1618`	`+ if (strcmp(yytext, ptr->olddef) == 0 && ptr->used == NULL)`
`1617`	`1619`	`{`
`1618`	`1620`	`struct _yy_buffer *yb;`
`1619`	`1621`
`@@ -1626,7 +1628,7 @@ static bool isdefine(void)`
`1626`	`1628`
`1627`	`1629`	`ptr->used = yy_buffer = yb;`
`1628`	`1630`
`1629`		`- yy_scan_string(ptr->new);`
	`1631`	`+ yy_scan_string(ptr->newdef);`
`1630`	`1632`	`return true;`
`1631`	`1633`	`}`
`1632`	`1634`	`}`