glsl2: Add missing include of string.h

Makes the build happy on non-GCC platforms.

1 files changed, 108 insertions, 107 deletions

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index df26899a0f..a4d46042ff 100644
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -95,6 +95,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <inttypes.h>
 
@@ -212,7 +213,7 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
 
 
 /* Line 189 of yacc.c  */
-#line 216 "glcpp/glcpp-parse.c"
+#line 217 "glcpp/glcpp-parse.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -300,7 +301,7 @@ typedef struct YYLTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 304 "glcpp/glcpp-parse.c"
+#line 305 "glcpp/glcpp-parse.c"
 
 #ifdef short
 # undef short
@@ -625,17 +626,17 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   180,   180,   182,   186,   189,   194,   195,   199,   202,
-     208,   211,   214,   217,   225,   244,   254,   259,   264,   283,
-     298,   301,   304,   313,   317,   326,   331,   332,   335,   338,
-     341,   344,   347,   350,   353,   356,   359,   362,   365,   368,
-     371,   374,   377,   380,   383,   386,   389,   392,   395,   398,
-     404,   409,   417,   418,   422,   428,   429,   432,   434,   441,
-     445,   449,   454,   460,   468,   474,   482,   486,   490,   494,
-     498,   505,   506,   507,   508,   509,   510,   511,   512,   513,
-     514,   515,   516,   517,   518,   519,   520,   521,   522,   523,
-     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535
+       0,   181,   181,   183,   187,   190,   195,   196,   200,   203,
+     209,   212,   215,   218,   226,   245,   255,   260,   265,   284,
+     299,   302,   305,   314,   318,   327,   332,   333,   336,   339,
+     342,   345,   348,   351,   354,   357,   360,   363,   366,   369,
+     372,   375,   378,   381,   384,   387,   390,   393,   396,   399,
+     405,   410,   418,   419,   423,   429,   430,   433,   435,   442,
+     446,   450,   455,   461,   469,   475,   483,   487,   491,   495,
+     499,   506,   507,   508,   509,   510,   511,   512,   513,   514,
+     515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
+     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536
 };
 #endif
 
@@ -1595,7 +1596,7 @@ YYLTYPE yylloc;
 /* User initialization code.  */
 
 /* Line 1242 of yacc.c  */
-#line 147 "glcpp/glcpp-parse.y"
+#line 148 "glcpp/glcpp-parse.y"
 {
 	yylloc.first_line = 1;
 	yylloc.first_column = 1;
@@ -1605,7 +1606,7 @@ YYLTYPE yylloc;
 }
 
 /* Line 1242 of yacc.c  */
-#line 1609 "glcpp/glcpp-parse.c"
+#line 1610 "glcpp/glcpp-parse.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1793,7 +1794,7 @@ yyreduce:
         case 4:
 
 /* Line 1455 of yacc.c  */
-#line 186 "glcpp/glcpp-parse.y"
+#line 187 "glcpp/glcpp-parse.y"
     {
 		glcpp_print(parser->output, "\n");
 	;}
@@ -1802,7 +1803,7 @@ yyreduce:
   case 5:
 
 /* Line 1455 of yacc.c  */
-#line 189 "glcpp/glcpp-parse.y"
+#line 190 "glcpp/glcpp-parse.y"
     {
 		_glcpp_parser_print_expanded_token_list (parser, (yyvsp[(1) - (1)].token_list));
 		glcpp_print(parser->output, "\n");
@@ -1813,7 +1814,7 @@ yyreduce:
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 199 "glcpp/glcpp-parse.y"
+#line 200 "glcpp/glcpp-parse.y"
     {
 		_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), (yyvsp[(2) - (3)].ival));
 	;}
@@ -1822,7 +1823,7 @@ yyreduce:
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 202 "glcpp/glcpp-parse.y"
+#line 203 "glcpp/glcpp-parse.y"
     {
 		_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]), "elif", (yyvsp[(2) - (3)].ival));
 	;}
@@ -1831,7 +1832,7 @@ yyreduce:
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 208 "glcpp/glcpp-parse.y"
+#line 209 "glcpp/glcpp-parse.y"
     {
 		_define_object_macro (parser, & (yylsp[(2) - (4)]), (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].token_list));
 	;}
@@ -1840,7 +1841,7 @@ yyreduce:
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 211 "glcpp/glcpp-parse.y"
+#line 212 "glcpp/glcpp-parse.y"
     {
 		_define_function_macro (parser, & (yylsp[(2) - (6)]), (yyvsp[(2) - (6)].str), NULL, (yyvsp[(5) - (6)].token_list));
 	;}
@@ -1849,7 +1850,7 @@ yyreduce:
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 214 "glcpp/glcpp-parse.y"
+#line 215 "glcpp/glcpp-parse.y"
     {
 		_define_function_macro (parser, & (yylsp[(2) - (7)]), (yyvsp[(2) - (7)].str), (yyvsp[(4) - (7)].string_list), (yyvsp[(6) - (7)].token_list));
 	;}
@@ -1858,7 +1859,7 @@ yyreduce:
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 217 "glcpp/glcpp-parse.y"
+#line 218 "glcpp/glcpp-parse.y"
     {
 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (3)].str));
 		if (macro) {
@@ -1872,7 +1873,7 @@ yyreduce:
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 225 "glcpp/glcpp-parse.y"
+#line 226 "glcpp/glcpp-parse.y"
     {
 		/* Be careful to only evaluate the 'if' expression if
 		 * we are not skipping. When we are skipping, we
@@ -1897,7 +1898,7 @@ yyreduce:
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 244 "glcpp/glcpp-parse.y"
+#line 245 "glcpp/glcpp-parse.y"
     {
 		/* #if without an expression is only an error if we
 		 *  are not skipping */
@@ -1913,7 +1914,7 @@ yyreduce:
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 254 "glcpp/glcpp-parse.y"
+#line 255 "glcpp/glcpp-parse.y"
     {
 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
 		talloc_free ((yyvsp[(2) - (4)].str));
@@ -1924,7 +1925,7 @@ yyreduce:
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 259 "glcpp/glcpp-parse.y"
+#line 260 "glcpp/glcpp-parse.y"
     {
 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
 		talloc_free ((yyvsp[(2) - (4)].str));
@@ -1935,7 +1936,7 @@ yyreduce:
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 264 "glcpp/glcpp-parse.y"
+#line 265 "glcpp/glcpp-parse.y"
     {
 		/* Be careful to only evaluate the 'elif' expression
 		 * if we are not skipping. When we are skipping, we
@@ -1960,7 +1961,7 @@ yyreduce:
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 283 "glcpp/glcpp-parse.y"
+#line 284 "glcpp/glcpp-parse.y"
     {
 		/* #elif without an expression is an error unless we
 		 * are skipping. */
@@ -1981,7 +1982,7 @@ yyreduce:
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 298 "glcpp/glcpp-parse.y"
+#line 299 "glcpp/glcpp-parse.y"
     {
 		_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (2)]), "else", 1);
 	;}
@@ -1990,7 +1991,7 @@ yyreduce:
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 301 "glcpp/glcpp-parse.y"
+#line 302 "glcpp/glcpp-parse.y"
     {
 		_glcpp_parser_skip_stack_pop (parser, & (yylsp[(1) - (2)]));
 	;}
@@ -1999,7 +2000,7 @@ yyreduce:
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 304 "glcpp/glcpp-parse.y"
+#line 305 "glcpp/glcpp-parse.y"
     {
 		macro_t *macro = hash_table_find (parser->defines, "__VERSION__");
 		if (macro) {
@@ -2014,7 +2015,7 @@ yyreduce:
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 317 "glcpp/glcpp-parse.y"
+#line 318 "glcpp/glcpp-parse.y"
     {
 		if (strlen ((yyvsp[(1) - (1)].str)) >= 3 && strncmp ((yyvsp[(1) - (1)].str), "0x", 2) == 0) {
 			(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str) + 2, NULL, 16);
@@ -2029,7 +2030,7 @@ yyreduce:
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 326 "glcpp/glcpp-parse.y"
+#line 327 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (1)].ival);
 	;}
@@ -2038,7 +2039,7 @@ yyreduce:
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 332 "glcpp/glcpp-parse.y"
+#line 333 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival);
 	;}
@@ -2047,7 +2048,7 @@ yyreduce:
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 335 "glcpp/glcpp-parse.y"
+#line 336 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) && (yyvsp[(3) - (3)].ival);
 	;}
@@ -2056,7 +2057,7 @@ yyreduce:
   case 29:
 
 /* Line 1455 of yacc.c  */
-#line 338 "glcpp/glcpp-parse.y"
+#line 339 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival);
 	;}
@@ -2065,7 +2066,7 @@ yyreduce:
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 341 "glcpp/glcpp-parse.y"
+#line 342 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) ^ (yyvsp[(3) - (3)].ival);
 	;}
@@ -2074,7 +2075,7 @@ yyreduce:
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 344 "glcpp/glcpp-parse.y"
+#line 345 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) & (yyvsp[(3) - (3)].ival);
 	;}
@@ -2083,7 +2084,7 @@ yyreduce:
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 347 "glcpp/glcpp-parse.y"
+#line 348 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival);
 	;}
@@ -2092,7 +2093,7 @@ yyreduce:
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 350 "glcpp/glcpp-parse.y"
+#line 351 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival);
 	;}
@@ -2101,7 +2102,7 @@ yyreduce:
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 353 "glcpp/glcpp-parse.y"
+#line 354 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) >= (yyvsp[(3) - (3)].ival);
 	;}
@@ -2110,7 +2111,7 @@ yyreduce:
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 356 "glcpp/glcpp-parse.y"
+#line 357 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) <= (yyvsp[(3) - (3)].ival);
 	;}
@@ -2119,7 +2120,7 @@ yyreduce:
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 359 "glcpp/glcpp-parse.y"
+#line 360 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) > (yyvsp[(3) - (3)].ival);
 	;}
@@ -2128,7 +2129,7 @@ yyreduce:
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 362 "glcpp/glcpp-parse.y"
+#line 363 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) < (yyvsp[(3) - (3)].ival);
 	;}
@@ -2137,7 +2138,7 @@ yyreduce:
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 365 "glcpp/glcpp-parse.y"
+#line 366 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) >> (yyvsp[(3) - (3)].ival);
 	;}
@@ -2146,7 +2147,7 @@ yyreduce:
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 368 "glcpp/glcpp-parse.y"
+#line 369 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) << (yyvsp[(3) - (3)].ival);
 	;}
@@ -2155,7 +2156,7 @@ yyreduce:
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 371 "glcpp/glcpp-parse.y"
+#line 372 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival);
 	;}
@@ -2164,7 +2165,7 @@ yyreduce:
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 374 "glcpp/glcpp-parse.y"
+#line 375 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival);
 	;}
@@ -2173,7 +2174,7 @@ yyreduce:
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 377 "glcpp/glcpp-parse.y"
+#line 378 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) % (yyvsp[(3) - (3)].ival);
 	;}
@@ -2182,7 +2183,7 @@ yyreduce:
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 380 "glcpp/glcpp-parse.y"
+#line 381 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival);
 	;}
@@ -2191,7 +2192,7 @@ yyreduce:
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 383 "glcpp/glcpp-parse.y"
+#line 384 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival);
 	;}
@@ -2200,7 +2201,7 @@ yyreduce:
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 386 "glcpp/glcpp-parse.y"
+#line 387 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = ! (yyvsp[(2) - (2)].ival);
 	;}
@@ -2209,7 +2210,7 @@ yyreduce:
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 389 "glcpp/glcpp-parse.y"
+#line 390 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = ~ (yyvsp[(2) - (2)].ival);
 	;}
@@ -2218,7 +2219,7 @@ yyreduce:
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 392 "glcpp/glcpp-parse.y"
+#line 393 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = - (yyvsp[(2) - (2)].ival);
 	;}
@@ -2227,7 +2228,7 @@ yyreduce:
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 395 "glcpp/glcpp-parse.y"
+#line 396 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = + (yyvsp[(2) - (2)].ival);
 	;}
@@ -2236,7 +2237,7 @@ yyreduce:
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 398 "glcpp/glcpp-parse.y"
+#line 399 "glcpp/glcpp-parse.y"
     {
 		(yyval.ival) = (yyvsp[(2) - (3)].ival);
 	;}
@@ -2245,7 +2246,7 @@ yyreduce:
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 404 "glcpp/glcpp-parse.y"
+#line 405 "glcpp/glcpp-parse.y"
     {
 		(yyval.string_list) = _string_list_create (parser);
 		_string_list_append_item ((yyval.string_list), (yyvsp[(1) - (1)].str));
@@ -2256,7 +2257,7 @@ yyreduce:
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 409 "glcpp/glcpp-parse.y"
+#line 410 "glcpp/glcpp-parse.y"
     {
 		(yyval.string_list) = (yyvsp[(1) - (3)].string_list);	
 		_string_list_append_item ((yyval.string_list), (yyvsp[(3) - (3)].str));
@@ -2267,14 +2268,14 @@ yyreduce:
   case 52:
 
 /* Line 1455 of yacc.c  */
-#line 417 "glcpp/glcpp-parse.y"
+#line 418 "glcpp/glcpp-parse.y"
     { (yyval.token_list) = NULL; ;}
     break;
 
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 422 "glcpp/glcpp-parse.y"
+#line 423 "glcpp/glcpp-parse.y"
     {
 		yyerror (& (yylsp[(1) - (2)]), parser, "Invalid tokens after #");
 	;}
@@ -2283,14 +2284,14 @@ yyreduce:
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 428 "glcpp/glcpp-parse.y"
+#line 429 "glcpp/glcpp-parse.y"
     { (yyval.token_list) = NULL; ;}
     break;
 
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 434 "glcpp/glcpp-parse.y"
+#line 435 "glcpp/glcpp-parse.y"
     {
 		glcpp_warning(&(yylsp[(1) - (1)]), parser, "extra tokens at end of directive");
 	;}
@@ -2299,7 +2300,7 @@ yyreduce:
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 441 "glcpp/glcpp-parse.y"
+#line 442 "glcpp/glcpp-parse.y"
     {
 		int v = hash_table_find (parser->defines, (yyvsp[(2) - (2)].str)) ? 1 : 0;
 		(yyval.token) = _token_create_ival (parser, INTEGER, v);
@@ -2309,7 +2310,7 @@ yyreduce:
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 445 "glcpp/glcpp-parse.y"
+#line 446 "glcpp/glcpp-parse.y"
     {
 		int v = hash_table_find (parser->defines, (yyvsp[(3) - (4)].str)) ? 1 : 0;
 		(yyval.token) = _token_create_ival (parser, INTEGER, v);
@@ -2319,7 +2320,7 @@ yyreduce:
   case 62:
 
 /* Line 1455 of yacc.c  */
-#line 454 "glcpp/glcpp-parse.y"
+#line 455 "glcpp/glcpp-parse.y"
     {
 		parser->space_tokens = 1;
 		(yyval.token_list) = _token_list_create (parser);
@@ -2331,7 +2332,7 @@ yyreduce:
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 460 "glcpp/glcpp-parse.y"
+#line 461 "glcpp/glcpp-parse.y"
     {
 		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
 		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
@@ -2342,7 +2343,7 @@ yyreduce:
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 468 "glcpp/glcpp-parse.y"
+#line 469 "glcpp/glcpp-parse.y"
     {
 		parser->space_tokens = 1;
 		(yyval.token_list) = _token_list_create (parser);
@@ -2354,7 +2355,7 @@ yyreduce:
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 474 "glcpp/glcpp-parse.y"
+#line 475 "glcpp/glcpp-parse.y"
     {
 		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
 		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
@@ -2365,7 +2366,7 @@ yyreduce:
   case 66:
 
 /* Line 1455 of yacc.c  */
-#line 482 "glcpp/glcpp-parse.y"
+#line 483 "glcpp/glcpp-parse.y"
     {
 		(yyval.token) = _token_create_str (parser, IDENTIFIER, (yyvsp[(1) - (1)].str));
 		(yyval.token)->location = yylloc;
@@ -2375,7 +2376,7 @@ yyreduce:
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 486 "glcpp/glcpp-parse.y"
+#line 487 "glcpp/glcpp-parse.y"
     {
 		(yyval.token) = _token_create_str (parser, INTEGER_STRING, (yyvsp[(1) - (1)].str));
 		(yyval.token)->location = yylloc;
@@ -2385,7 +2386,7 @@ yyreduce:
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 490 "glcpp/glcpp-parse.y"
+#line 491 "glcpp/glcpp-parse.y"
     {
 		(yyval.token) = _token_create_ival (parser, (yyvsp[(1) - (1)].ival), (yyvsp[(1) - (1)].ival));
 		(yyval.token)->location = yylloc;
@@ -2395,7 +2396,7 @@ yyreduce:
   case 69:
 
 /* Line 1455 of yacc.c  */
-#line 494 "glcpp/glcpp-parse.y"
+#line 495 "glcpp/glcpp-parse.y"
     {
 		(yyval.token) = _token_create_str (parser, OTHER, (yyvsp[(1) - (1)].str));
 		(yyval.token)->location = yylloc;
@@ -2405,7 +2406,7 @@ yyreduce:
   case 70:
 
 /* Line 1455 of yacc.c  */
-#line 498 "glcpp/glcpp-parse.y"
+#line 499 "glcpp/glcpp-parse.y"
     {
 		(yyval.token) = _token_create_ival (parser, SPACE, SPACE);
 		(yyval.token)->location = yylloc;
@@ -2415,224 +2416,224 @@ yyreduce:
   case 71:
 
 /* Line 1455 of yacc.c  */
-#line 505 "glcpp/glcpp-parse.y"
+#line 506 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '['; ;}
     break;
 
   case 72:
 
 /* Line 1455 of yacc.c  */
-#line 506 "glcpp/glcpp-parse.y"
+#line 507 "glcpp/glcpp-parse.y"
     { (yyval.ival) = ']'; ;}
     break;
 
   case 73:
 
 /* Line 1455 of yacc.c  */
-#line 507 "glcpp/glcpp-parse.y"
+#line 508 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '('; ;}
     break;
 
   case 74:
 
 /* Line 1455 of yacc.c  */
-#line 508 "glcpp/glcpp-parse.y"
+#line 509 "glcpp/glcpp-parse.y"
     { (yyval.ival) = ')'; ;}
     break;
 
   case 75:
 
 /* Line 1455 of yacc.c  */
-#line 509 "glcpp/glcpp-parse.y"
+#line 510 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '{'; ;}
     break;
 
   case 76:
 
 /* Line 1455 of yacc.c  */
-#line 510 "glcpp/glcpp-parse.y"
+#line 511 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '}'; ;}
     break;
 
   case 77:
 
 /* Line 1455 of yacc.c  */
-#line 511 "glcpp/glcpp-parse.y"
+#line 512 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '.'; ;}
     break;
 
   case 78:
 
 /* Line 1455 of yacc.c  */
-#line 512 "glcpp/glcpp-parse.y"
+#line 513 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '&'; ;}
     break;
 
   case 79:
 
 /* Line 1455 of yacc.c  */
-#line 513 "glcpp/glcpp-parse.y"
+#line 514 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '*'; ;}
     break;
 
   case 80:
 
 /* Line 1455 of yacc.c  */
-#line 514 "glcpp/glcpp-parse.y"
+#line 515 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '+'; ;}
     break;
 
   case 81:
 
 /* Line 1455 of yacc.c  */
-#line 515 "glcpp/glcpp-parse.y"
+#line 516 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '-'; ;}
     break;
 
   case 82:
 
 /* Line 1455 of yacc.c  */
-#line 516 "glcpp/glcpp-parse.y"
+#line 517 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '~'; ;}
     break;
 
   case 83:
 
 /* Line 1455 of yacc.c  */
-#line 517 "glcpp/glcpp-parse.y"
+#line 518 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '!'; ;}
     break;
 
   case 84:
 
 /* Line 1455 of yacc.c  */
-#line 518 "glcpp/glcpp-parse.y"
+#line 519 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '/'; ;}
     break;
 
   case 85:
 
 /* Line 1455 of yacc.c  */
-#line 519 "glcpp/glcpp-parse.y"
+#line 520 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '%'; ;}
     break;
 
   case 86:
 
 /* Line 1455 of yacc.c  */
-#line 520 "glcpp/glcpp-parse.y"
+#line 521 "glcpp/glcpp-parse.y"
     { (yyval.ival) = LEFT_SHIFT; ;}
     break;
 
   case 87:
 
 /* Line 1455 of yacc.c  */
-#line 521 "glcpp/glcpp-parse.y"
+#line 522 "glcpp/glcpp-parse.y"
     { (yyval.ival) = RIGHT_SHIFT; ;}
     break;
 
   case 88:
 
 /* Line 1455 of yacc.c  */
-#line 522 "glcpp/glcpp-parse.y"
+#line 523 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '<'; ;}
     break;
 
   case 89:
 
 /* Line 1455 of yacc.c  */
-#line 523 "glcpp/glcpp-parse.y"
+#line 524 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '>'; ;}
     break;
 
   case 90:
 
 /* Line 1455 of yacc.c  */
-#line 524 "glcpp/glcpp-parse.y"
+#line 525 "glcpp/glcpp-parse.y"
     { (yyval.ival) = LESS_OR_EQUAL; ;}
     break;
 
   case 91:
 
 /* Line 1455 of yacc.c  */
-#line 525 "glcpp/glcpp-parse.y"
+#line 526 "glcpp/glcpp-parse.y"
     { (yyval.ival) = GREATER_OR_EQUAL; ;}
     break;
 
   case 92:
 
 /* Line 1455 of yacc.c  */
-#line 526 "glcpp/glcpp-parse.y"
+#line 527 "glcpp/glcpp-parse.y"
     { (yyval.ival) = EQUAL; ;}
     break;
 
   case 93:
 
 /* Line 1455 of yacc.c  */
-#line 527 "glcpp/glcpp-parse.y"
+#line 528 "glcpp/glcpp-parse.y"
     { (yyval.ival) = NOT_EQUAL; ;}
     break;
 
   case 94:
 
 /* Line 1455 of yacc.c  */
-#line 528 "glcpp/glcpp-parse.y"
+#line 529 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '^'; ;}
     break;
 
   case 95:
 
 /* Line 1455 of yacc.c  */
-#line 529 "glcpp/glcpp-parse.y"
+#line 530 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '|'; ;}
     break;
 
   case 96:
 
 /* Line 1455 of yacc.c  */
-#line 530 "glcpp/glcpp-parse.y"
+#line 531 "glcpp/glcpp-parse.y"
     { (yyval.ival) = AND; ;}
     break;
 
   case 97:
 
 /* Line 1455 of yacc.c  */
-#line 531 "glcpp/glcpp-parse.y"
+#line 532 "glcpp/glcpp-parse.y"
     { (yyval.ival) = OR; ;}
     break;
 
   case 98:
 
 /* Line 1455 of yacc.c  */
-#line 532 "glcpp/glcpp-parse.y"
+#line 533 "glcpp/glcpp-parse.y"
     { (yyval.ival) = ';'; ;}
     break;
 
   case 99:
 
 /* Line 1455 of yacc.c  */
-#line 533 "glcpp/glcpp-parse.y"
+#line 534 "glcpp/glcpp-parse.y"
     { (yyval.ival) = ','; ;}
     break;
 
   case 100:
 
 /* Line 1455 of yacc.c  */
-#line 534 "glcpp/glcpp-parse.y"
+#line 535 "glcpp/glcpp-parse.y"
     { (yyval.ival) = '='; ;}
     break;
 
   case 101:
 
 /* Line 1455 of yacc.c  */
-#line 535 "glcpp/glcpp-parse.y"
+#line 536 "glcpp/glcpp-parse.y"
     { (yyval.ival) = PASTE; ;}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 2636 "glcpp/glcpp-parse.c"
+#line 2637 "glcpp/glcpp-parse.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2851,7 +2852,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 538 "glcpp/glcpp-parse.y"
+#line 539 "glcpp/glcpp-parse.y"
 
 
 string_list_t *