Fix portability issue in isolationtester grammar.

tglsfdc · tglsfdc · commit ee8b93c83d79 · 2015-05-27T19:14:40.000-04:00
specparse.y and specscanner.l used "string" as a token name.  Now, bison
likes to define each token name as a macro for the token code it assigns,
which means those names are basically off-limits for any other use within
the grammar file or included headers.  So names as generic as "string" are
dangerous.  This is what was causing the recent failures on protosciurus:
some versions of Solaris' sys/kstat.h use "string" as a field name.
With late-model bison we don't see this problem because the token macros
aren't defined till later (that is why castoroides didn't show the problem
even though it's on the same machine).  But protosciurus uses bison 1.875
which defines the token macros up front.

This land mine has been there from day one; we'd have found it sooner
except that protosciurus wasn't trying to run the isolation tests till
recently.

To fix, rename the token to "string_literal" which is hopefully less
likely to collide with names used by system headers.  Back-patch to
all branches containing the isolation tests.
diff --git a/src/test/isolation/specparse.y b/src/test/isolation/specparse.y
@@ -37,12 +37,12 @@ TestSpec		parseresult;			/* result of parsing is left here */
 
 %type <str>  opt_setup opt_teardown
 %type <ptr_list> step_list session_list permutation_list opt_permutation_list
-%type <ptr_list> string_list
+%type <ptr_list> string_literal_list
 %type <session> session
 %type <step> step
 %type <permutation> permutation
 
-%token <str> sqlblock string
+%token <str> sqlblock string_literal
 %token PERMUTATION SESSION SETUP STEP TEARDOWN TEST
 
 %%
@@ -89,7 +89,7 @@ session_list:
 		;
 
 session:
-			SESSION string opt_setup step_list opt_teardown
+			SESSION string_literal opt_setup step_list opt_teardown
 			{
 				$$ = malloc(sizeof(Session));
 				$$->name = $2;
@@ -118,7 +118,7 @@ step_list:
 
 
 step:
-			STEP string sqlblock
+			STEP string_literal sqlblock
 			{
 				$$ = malloc(sizeof(Step));
 				$$->name = $2;
@@ -156,23 +156,23 @@ permutation_list:
 
 
 permutation:
-			PERMUTATION string_list
+			PERMUTATION string_literal_list
 			{
 				$$ = malloc(sizeof(Permutation));
 				$$->stepnames = (char **) $2.elements;
 				$$->nsteps = $2.nelements;
 			}
 		;
 
-string_list:
-			string_list string
+string_literal_list:
+			string_literal_list string_literal
 			{
 				$$.elements = realloc($1.elements,
 									  ($1.nelements + 1) * sizeof(void *));
 				$$.elements[$1.nelements] = $2;
 				$$.nelements = $1.nelements + 1;
 			}
-			| string
+			| string_literal
 			{
 				$$.nelements = 1;
 				$$.elements = malloc(sizeof(void *));
diff --git a/src/test/isolation/specscanner.l b/src/test/isolation/specscanner.l
@@ -57,7 +57,7 @@ teardown		{ return(TEARDOWN); }
 					litbuf[litbufpos] = '\0';
 					yylval.str = strdup(litbuf);
 					BEGIN(INITIAL);
-					return(string);
+					return(string_literal);
 				}
 <qstr>.			{ addlitchar(yytext[0]); }
 <qstr>\n		{ yyerror("unexpected newline in quoted string"); }

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ TestSpec parseresult; /* result of parsing is left here */`
`37`	`37`
`38`	`38`	`%type <str> opt_setup opt_teardown`
`39`	`39`	`%type <ptr_list> step_list session_list permutation_list opt_permutation_list`
`40`		`-%type <ptr_list> string_list`
	`40`	`+%type <ptr_list> string_literal_list`
`41`	`41`	`%type <session> session`
`42`	`42`	`%type <step> step`
`43`	`43`	`%type <permutation> permutation`
`44`	`44`
`45`		`-%token <str> sqlblock string`
	`45`	`+%token <str> sqlblock string_literal`
`46`	`46`	`%token PERMUTATION SESSION SETUP STEP TEARDOWN TEST`
`47`	`47`
`48`	`48`	`%%`
`@@ -89,7 +89,7 @@ session_list:`
`89`	`89`	`;`
`90`	`90`
`91`	`91`	`session:`
`92`		`- SESSION string opt_setup step_list opt_teardown`
	`92`	`+ SESSION string_literal opt_setup step_list opt_teardown`
`93`	`93`	`{`
`94`	`94`	`$$ = malloc(sizeof(Session));`
`95`	`95`	`$$->name = $2;`
`@@ -118,7 +118,7 @@ step_list:`
`118`	`118`
`119`	`119`
`120`	`120`	`step:`
`121`		`- STEP string sqlblock`
	`121`	`+ STEP string_literal sqlblock`
`122`	`122`	`{`
`123`	`123`	`$$ = malloc(sizeof(Step));`
`124`	`124`	`$$->name = $2;`
`@@ -156,23 +156,23 @@ permutation_list:`
`156`	`156`
`157`	`157`
`158`	`158`	`permutation:`
`159`		`- PERMUTATION string_list`
	`159`	`+ PERMUTATION string_literal_list`
`160`	`160`	`{`
`161`	`161`	`$$ = malloc(sizeof(Permutation));`
`162`	`162`	`$$->stepnames = (char **) $2.elements;`
`163`	`163`	`$$->nsteps = $2.nelements;`
`164`	`164`	`}`
`165`	`165`	`;`
`166`	`166`
`167`		`-string_list:`
`168`		`- string_list string`
	`167`	`+string_literal_list:`
	`168`	`+ string_literal_list string_literal`
`169`	`169`	`{`
`170`	`170`	`$$.elements = realloc($1.elements,`
`171`	`171`	`($1.nelements + 1) * sizeof(void *));`
`172`	`172`	`$$.elements[$1.nelements] = $2;`
`173`	`173`	`$$.nelements = $1.nelements + 1;`
`174`	`174`	`}`
`175`		`- \| string`
	`175`	`+ \| string_literal`
`176`	`176`	`{`
`177`	`177`	`$$.nelements = 1;`
`178`	`178`	`$$.elements = malloc(sizeof(void *));`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ teardown { return(TEARDOWN); }`
`57`	`57`	`litbuf[litbufpos] = '\0';`
`58`	`58`	`yylval.str = strdup(litbuf);`
`59`	`59`	`BEGIN(INITIAL);`
`60`		`- return(string);`
	`60`	`+ return(string_literal);`
`61`	`61`	`}`
`62`	`62`	`<qstr>. { addlitchar(yytext[0]); }`
`63`	`63`	`<qstr>\n { yyerror("unexpected newline in quoted string"); }`