| Index: third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.c
|
| diff --git a/third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.c b/third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.c
|
| index 84a25d87b8d91cfbb8d58b6db99da322bc75b4d1..2eb225f0036c62bba9dc07a4e14dd14e9b400193 100644
|
| --- a/third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.c
|
| +++ b/third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.c
|
| @@ -1,9 +1,10 @@
|
| -/* A Bison parser, made by GNU Bison 2.4.3. */
|
| +
|
| +/* A Bison parser, made by GNU Bison 2.4.1. */
|
|
|
| /* Skeleton implementation for Bison's Yacc-like parsers in C
|
|
|
| - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
| - 2009, 2010 Free Software Foundation, Inc.
|
| + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
| + Free Software Foundation, Inc.
|
|
|
| This program is free software: you can redistribute it and/or modify
|
| it under the terms of the GNU General Public License as published by
|
| @@ -45,7 +46,7 @@
|
| #define YYBISON 1
|
|
|
| /* Bison version. */
|
| -#define YYBISON_VERSION "2.4.3"
|
| +#define YYBISON_VERSION "2.4.1"
|
|
|
| /* Skeleton name. */
|
| #define YYSKELETON_NAME "yacc.c"
|
| @@ -67,7 +68,7 @@
|
| /* Copy the first part of user declarations. */
|
|
|
| /* Line 189 of yacc.c */
|
| -#line 1 "glcpp/glcpp-parse.y"
|
| +#line 1 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
|
|
| /*
|
| * Copyright © 2010 Intel Corporation
|
| @@ -227,7 +228,7 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
|
|
|
|
|
| /* Line 189 of yacc.c */
|
| -#line 223 "glcpp/glcpp-parse.c"
|
| +#line 232 "y.tab.c"
|
|
|
| /* Enabling traces. */
|
| #ifndef YYDEBUG
|
| @@ -288,6 +289,40 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
|
| UNARY = 289
|
| };
|
| #endif
|
| +/* Tokens. */
|
| +#define COMMA_FINAL 258
|
| +#define DEFINED 259
|
| +#define ELIF_EXPANDED 260
|
| +#define HASH 261
|
| +#define HASH_DEFINE_FUNC 262
|
| +#define HASH_DEFINE_OBJ 263
|
| +#define HASH_ELIF 264
|
| +#define HASH_ELSE 265
|
| +#define HASH_ENDIF 266
|
| +#define HASH_IF 267
|
| +#define HASH_IFDEF 268
|
| +#define HASH_IFNDEF 269
|
| +#define HASH_UNDEF 270
|
| +#define HASH_VERSION 271
|
| +#define IDENTIFIER 272
|
| +#define IF_EXPANDED 273
|
| +#define INTEGER 274
|
| +#define INTEGER_STRING 275
|
| +#define NEWLINE 276
|
| +#define OTHER 277
|
| +#define PLACEHOLDER 278
|
| +#define SPACE 279
|
| +#define PASTE 280
|
| +#define OR 281
|
| +#define AND 282
|
| +#define NOT_EQUAL 283
|
| +#define EQUAL 284
|
| +#define GREATER_OR_EQUAL 285
|
| +#define LESS_OR_EQUAL 286
|
| +#define RIGHT_SHIFT 287
|
| +#define LEFT_SHIFT 288
|
| +#define UNARY 289
|
| +
|
|
|
|
|
|
|
| @@ -315,7 +350,7 @@ typedef struct YYLTYPE
|
|
|
|
|
| /* Line 264 of yacc.c */
|
| -#line 311 "glcpp/glcpp-parse.c"
|
| +#line 354 "y.tab.c"
|
|
|
| #ifdef short
|
| # undef short
|
| @@ -365,7 +400,7 @@ typedef short int yytype_int16;
|
| #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
|
|
|
| #ifndef YY_
|
| -# if defined YYENABLE_NLS && YYENABLE_NLS
|
| +# if YYENABLE_NLS
|
| # if ENABLE_NLS
|
| # include <libintl.h> /* INFRINGES ON USER NAME SPACE */
|
| # define YY_(msgid) dgettext ("bison-runtime", msgid)
|
| @@ -640,17 +675,17 @@ static const yytype_int8 yyrhs[] =
|
| /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
|
| static const yytype_uint16 yyrline[] =
|
| {
|
| - 0, 188, 188, 190, 194, 197, 202, 203, 207, 210,
|
| - 216, 219, 222, 225, 233, 252, 262, 267, 272, 291,
|
| - 306, 309, 312, 325, 329, 338, 343, 344, 347, 350,
|
| - 353, 356, 359, 362, 365, 368, 371, 374, 377, 380,
|
| - 383, 386, 389, 392, 395, 398, 401, 404, 407, 410,
|
| - 416, 421, 429, 430, 434, 440, 441, 444, 446, 453,
|
| - 457, 461, 466, 472, 480, 486, 494, 498, 502, 506,
|
| - 510, 517, 518, 519, 520, 521, 522, 523, 524, 525,
|
| - 526, 527, 528, 529, 530, 531, 532, 533, 534, 535,
|
| - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545,
|
| - 546, 547
|
| + 0, 196, 196, 198, 202, 205, 210, 211, 215, 218,
|
| + 224, 227, 230, 233, 241, 260, 270, 275, 280, 299,
|
| + 314, 317, 320, 333, 337, 346, 351, 352, 355, 358,
|
| + 361, 364, 367, 370, 373, 376, 379, 382, 385, 388,
|
| + 391, 394, 397, 400, 403, 406, 409, 412, 415, 418,
|
| + 424, 429, 437, 438, 442, 448, 449, 452, 454, 461,
|
| + 465, 469, 474, 480, 488, 494, 502, 506, 510, 514,
|
| + 518, 525, 526, 527, 528, 529, 530, 531, 532, 533,
|
| + 534, 535, 536, 537, 538, 539, 540, 541, 542, 543,
|
| + 544, 545, 546, 547, 548, 549, 550, 551, 552, 553,
|
| + 554, 555
|
| };
|
| #endif
|
|
|
| @@ -953,18 +988,9 @@ static const yytype_uint8 yystos[] =
|
|
|
| /* Like YYERROR except do call yyerror. This remains here temporarily
|
| to ease the transition to the new meaning of YYERROR, for GCC.
|
| - Once GCC version 2 has supplanted version 1, this can go. However,
|
| - YYFAIL appears to be in use. Nevertheless, it is formally deprecated
|
| - in Bison 2.4.2's NEWS entry, where a plan to phase it out is
|
| - discussed. */
|
| + Once GCC version 2 has supplanted version 1, this can go. */
|
|
|
| #define YYFAIL goto yyerrlab
|
| -#if defined YYFAIL
|
| - /* This is here to suppress warnings from the GCC cpp's
|
| - -Wunused-macros. Normally we don't worry about that warning, but
|
| - some users do, and we want to make it easy for users to remove
|
| - YYFAIL uses, which will produce warnings from Bison 2.5. */
|
| -#endif
|
|
|
| #define YYRECOVERING() (!!yyerrstatus)
|
|
|
| @@ -1021,7 +1047,7 @@ while (YYID (0))
|
| we won't break user code: when these are the locations we know. */
|
|
|
| #ifndef YY_LOCATION_PRINT
|
| -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
|
| +# if YYLTYPE_IS_TRIVIAL
|
| # define YY_LOCATION_PRINT(File, Loc) \
|
| fprintf (File, "%d.%d-%d.%d", \
|
| (Loc).first_line, (Loc).first_column, \
|
| @@ -1563,7 +1589,7 @@ YYLTYPE yylloc;
|
| YYLTYPE *yylsp;
|
|
|
| /* The locations where the error started and ended. */
|
| - YYLTYPE yyerror_range[3];
|
| + YYLTYPE yyerror_range[2];
|
|
|
| YYSIZE_T yystacksize;
|
|
|
| @@ -1610,7 +1636,7 @@ YYLTYPE yylloc;
|
| yyvsp = yyvs;
|
| yylsp = yyls;
|
|
|
| -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
|
| +#if YYLTYPE_IS_TRIVIAL
|
| /* Initialize the default location before parsing starts. */
|
| yylloc.first_line = yylloc.last_line = 1;
|
| yylloc.first_column = yylloc.last_column = 1;
|
| @@ -1618,8 +1644,8 @@ YYLTYPE yylloc;
|
|
|
| /* User initialization code. */
|
|
|
| -/* Line 1251 of yacc.c */
|
| -#line 155 "glcpp/glcpp-parse.y"
|
| +/* Line 1242 of yacc.c */
|
| +#line 163 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| yylloc.first_line = 1;
|
| yylloc.first_column = 1;
|
| @@ -1628,8 +1654,8 @@ YYLTYPE yylloc;
|
| yylloc.source = 0;
|
| }
|
|
|
| -/* Line 1251 of yacc.c */
|
| -#line 1625 "glcpp/glcpp-parse.c"
|
| +/* Line 1242 of yacc.c */
|
| +#line 1659 "y.tab.c"
|
| yylsp[0] = yylloc;
|
|
|
| goto yysetstate;
|
| @@ -1816,73 +1842,73 @@ yyreduce:
|
| {
|
| case 4:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 194 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 202 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| glcpp_print(parser->output, "\n");
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 5:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 197 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 205 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _glcpp_parser_print_expanded_token_list (parser, (yyvsp[(1) - (1)].token_list));
|
| glcpp_print(parser->output, "\n");
|
| talloc_free ((yyvsp[(1) - (1)].token_list));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 8:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 207 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 215 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), (yyvsp[(2) - (3)].ival));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 9:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 210 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 218 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]), "elif", (yyvsp[(2) - (3)].ival));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 10:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 216 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 224 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _define_object_macro (parser, & (yylsp[(2) - (4)]), (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].token_list));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 11:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 219 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 227 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _define_function_macro (parser, & (yylsp[(2) - (6)]), (yyvsp[(2) - (6)].str), NULL, (yyvsp[(5) - (6)].token_list));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 12:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 222 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 230 "third_party/mesa/MesaLib/src/glsl/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));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 13:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 225 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 233 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (3)].str));
|
| if (macro) {
|
| @@ -1890,13 +1916,13 @@ yyreduce:
|
| talloc_free (macro);
|
| }
|
| talloc_free ((yyvsp[(2) - (3)].str));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 14:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 233 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 241 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| /* Be careful to only evaluate the 'if' expression if
|
| * we are not skipping. When we are skipping, we
|
| @@ -1915,13 +1941,13 @@ yyreduce:
|
| _glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), 0);
|
| parser->skip_stack->type = SKIP_TO_ENDIF;
|
| }
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 15:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 252 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 260 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| /* #if without an expression is only an error if we
|
| * are not skipping */
|
| @@ -1931,35 +1957,35 @@ yyreduce:
|
| glcpp_error(& (yylsp[(1) - (2)]), parser, "#if with no expression");
|
| }
|
| _glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (2)]), 0);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 16:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 262 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 270 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
|
| talloc_free ((yyvsp[(2) - (4)].str));
|
| _glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (4)]), macro != NULL);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 17:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 267 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 275 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
|
| talloc_free ((yyvsp[(2) - (4)].str));
|
| _glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (4)]), macro == NULL);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 18:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 272 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 280 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| /* Be careful to only evaluate the 'elif' expression
|
| * if we are not skipping. When we are skipping, we
|
| @@ -1978,13 +2004,13 @@ yyreduce:
|
| _glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]),
|
| "elif", 0);
|
| }
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 19:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 291 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 299 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| /* #elif without an expression is an error unless we
|
| * are skipping. */
|
| @@ -1999,31 +2025,31 @@ yyreduce:
|
| "elif", 0);
|
| glcpp_warning(& (yylsp[(1) - (2)]), parser, "ignoring illegal #elif without expression");
|
| }
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 20:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 306 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 314 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (2)]), "else", 1);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 21:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 309 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 317 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| _glcpp_parser_skip_stack_pop (parser, & (yylsp[(1) - (2)]));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 22:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 312 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 320 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| macro_t *macro = hash_table_find (parser->defines, "__VERSION__");
|
| if (macro) {
|
| @@ -2036,13 +2062,13 @@ yyreduce:
|
| add_builtin_define (parser, "GL_ES", 1);
|
|
|
| glcpp_printf(parser->output, "#version %" PRIiMAX, (yyvsp[(2) - (3)].ival));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 24:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 329 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 337 "third_party/mesa/MesaLib/src/glsl/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);
|
| @@ -2051,616 +2077,616 @@ yyreduce:
|
| } else {
|
| (yyval.ival) = strtoll ((yyvsp[(1) - (1)].str), NULL, 10);
|
| }
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 25:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 338 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 346 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (1)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 27:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 344 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 352 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 28:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 347 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 355 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) && (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 29:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 350 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 358 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 30:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 353 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 361 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) ^ (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 31:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 356 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 364 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) & (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 32:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 359 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 367 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 33:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 362 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 370 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 34:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 365 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 373 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) >= (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 35:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 368 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 376 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) <= (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 36:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 371 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 379 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) > (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 37:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 374 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 382 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) < (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 38:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 377 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 385 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) >> (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 39:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 380 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 388 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) << (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 40:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 383 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 391 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 41:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 386 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 394 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 42:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 389 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 397 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) % (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 43:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 392 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 400 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 44:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 395 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 403 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 45:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 398 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 406 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = ! (yyvsp[(2) - (2)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 46:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 401 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 409 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = ~ (yyvsp[(2) - (2)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 47:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 404 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 412 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = - (yyvsp[(2) - (2)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 48:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 407 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 415 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = + (yyvsp[(2) - (2)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 49:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 410 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 418 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.ival) = (yyvsp[(2) - (3)].ival);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 50:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 416 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 424 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.string_list) = _string_list_create (parser);
|
| _string_list_append_item ((yyval.string_list), (yyvsp[(1) - (1)].str));
|
| talloc_steal ((yyval.string_list), (yyvsp[(1) - (1)].str));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 51:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 421 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 429 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.string_list) = (yyvsp[(1) - (3)].string_list);
|
| _string_list_append_item ((yyval.string_list), (yyvsp[(3) - (3)].str));
|
| talloc_steal ((yyval.string_list), (yyvsp[(3) - (3)].str));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 52:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 429 "glcpp/glcpp-parse.y"
|
| - { (yyval.token_list) = NULL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 437 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.token_list) = NULL; }
|
| break;
|
|
|
| case 54:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 434 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 442 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| yyerror (& (yylsp[(1) - (2)]), parser, "Invalid tokens after #");
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 55:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 440 "glcpp/glcpp-parse.y"
|
| - { (yyval.token_list) = NULL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 448 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.token_list) = NULL; }
|
| break;
|
|
|
| case 58:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 446 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 454 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| glcpp_warning(&(yylsp[(1) - (1)]), parser, "extra tokens at end of directive");
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 59:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 453 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 461 "third_party/mesa/MesaLib/src/glsl/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);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 60:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 457 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 465 "third_party/mesa/MesaLib/src/glsl/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);
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 62:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 466 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 474 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| parser->space_tokens = 1;
|
| (yyval.token_list) = _token_list_create (parser);
|
| _token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));
|
| talloc_unlink (parser, (yyvsp[(1) - (1)].token));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 63:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 472 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 480 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token_list) = (yyvsp[(1) - (2)].token_list);
|
| _token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
|
| talloc_unlink (parser, (yyvsp[(2) - (2)].token));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 64:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 480 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 488 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| parser->space_tokens = 1;
|
| (yyval.token_list) = _token_list_create (parser);
|
| _token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));
|
| talloc_unlink (parser, (yyvsp[(1) - (1)].token));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 65:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 486 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 494 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token_list) = (yyvsp[(1) - (2)].token_list);
|
| _token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
|
| talloc_unlink (parser, (yyvsp[(2) - (2)].token));
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 66:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 494 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 502 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token) = _token_create_str (parser, IDENTIFIER, (yyvsp[(1) - (1)].str));
|
| (yyval.token)->location = yylloc;
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 67:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 498 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 506 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token) = _token_create_str (parser, INTEGER_STRING, (yyvsp[(1) - (1)].str));
|
| (yyval.token)->location = yylloc;
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 68:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 502 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 510 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token) = _token_create_ival (parser, (yyvsp[(1) - (1)].ival), (yyvsp[(1) - (1)].ival));
|
| (yyval.token)->location = yylloc;
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 69:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 506 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 514 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token) = _token_create_str (parser, OTHER, (yyvsp[(1) - (1)].str));
|
| (yyval.token)->location = yylloc;
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 70:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 510 "glcpp/glcpp-parse.y"
|
| +/* Line 1455 of yacc.c */
|
| +#line 518 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| {
|
| (yyval.token) = _token_create_ival (parser, SPACE, SPACE);
|
| (yyval.token)->location = yylloc;
|
| - ;}
|
| + }
|
| break;
|
|
|
| case 71:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 517 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '['; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 525 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '['; }
|
| break;
|
|
|
| case 72:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 518 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = ']'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 526 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = ']'; }
|
| break;
|
|
|
| case 73:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 519 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '('; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 527 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '('; }
|
| break;
|
|
|
| case 74:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 520 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = ')'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 528 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = ')'; }
|
| break;
|
|
|
| case 75:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 521 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '{'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 529 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '{'; }
|
| break;
|
|
|
| case 76:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 522 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '}'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 530 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '}'; }
|
| break;
|
|
|
| case 77:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 523 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '.'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 531 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '.'; }
|
| break;
|
|
|
| case 78:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 524 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '&'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 532 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '&'; }
|
| break;
|
|
|
| case 79:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 525 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '*'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 533 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '*'; }
|
| break;
|
|
|
| case 80:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 526 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '+'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 534 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '+'; }
|
| break;
|
|
|
| case 81:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 527 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '-'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 535 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '-'; }
|
| break;
|
|
|
| case 82:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 528 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '~'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 536 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '~'; }
|
| break;
|
|
|
| case 83:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 529 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '!'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 537 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '!'; }
|
| break;
|
|
|
| case 84:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 530 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '/'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 538 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '/'; }
|
| break;
|
|
|
| case 85:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 531 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '%'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 539 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '%'; }
|
| break;
|
|
|
| case 86:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 532 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = LEFT_SHIFT; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 540 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = LEFT_SHIFT; }
|
| break;
|
|
|
| case 87:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 533 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = RIGHT_SHIFT; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 541 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = RIGHT_SHIFT; }
|
| break;
|
|
|
| case 88:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 534 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '<'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 542 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '<'; }
|
| break;
|
|
|
| case 89:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 535 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '>'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 543 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '>'; }
|
| break;
|
|
|
| case 90:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 536 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = LESS_OR_EQUAL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 544 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = LESS_OR_EQUAL; }
|
| break;
|
|
|
| case 91:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 537 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = GREATER_OR_EQUAL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 545 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = GREATER_OR_EQUAL; }
|
| break;
|
|
|
| case 92:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 538 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = EQUAL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 546 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = EQUAL; }
|
| break;
|
|
|
| case 93:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 539 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = NOT_EQUAL; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 547 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = NOT_EQUAL; }
|
| break;
|
|
|
| case 94:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 540 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '^'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 548 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '^'; }
|
| break;
|
|
|
| case 95:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 541 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '|'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 549 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '|'; }
|
| break;
|
|
|
| case 96:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 542 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = AND; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 550 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = AND; }
|
| break;
|
|
|
| case 97:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 543 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = OR; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 551 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = OR; }
|
| break;
|
|
|
| case 98:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 544 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = ';'; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 552 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = ';'; }
|
| break;
|
|
|
| case 99:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 545 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = ','; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 553 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = ','; }
|
| break;
|
|
|
| case 100:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 546 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = '='; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 554 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = '='; }
|
| break;
|
|
|
| case 101:
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 547 "glcpp/glcpp-parse.y"
|
| - { (yyval.ival) = PASTE; ;}
|
| +/* Line 1455 of yacc.c */
|
| +#line 555 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
| + { (yyval.ival) = PASTE; }
|
| break;
|
|
|
|
|
|
|
| -/* Line 1464 of yacc.c */
|
| -#line 2656 "glcpp/glcpp-parse.c"
|
| +/* Line 1455 of yacc.c */
|
| +#line 2690 "y.tab.c"
|
| default: break;
|
| }
|
| YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
|
| @@ -2732,7 +2758,7 @@ yyerrlab:
|
| #endif
|
| }
|
|
|
| - yyerror_range[1] = yylloc;
|
| + yyerror_range[0] = yylloc;
|
|
|
| if (yyerrstatus == 3)
|
| {
|
| @@ -2769,7 +2795,7 @@ yyerrorlab:
|
| if (/*CONSTCOND*/ 0)
|
| goto yyerrorlab;
|
|
|
| - yyerror_range[1] = yylsp[1-yylen];
|
| + yyerror_range[0] = yylsp[1-yylen];
|
| /* Do not reclaim the symbols of the rule which action triggered
|
| this YYERROR. */
|
| YYPOPSTACK (yylen);
|
| @@ -2803,7 +2829,7 @@ yyerrlab1:
|
| if (yyssp == yyss)
|
| YYABORT;
|
|
|
| - yyerror_range[1] = *yylsp;
|
| + yyerror_range[0] = *yylsp;
|
| yydestruct ("Error: popping",
|
| yystos[yystate], yyvsp, yylsp, parser);
|
| YYPOPSTACK (1);
|
| @@ -2813,10 +2839,10 @@ yyerrlab1:
|
|
|
| *++yyvsp = yylval;
|
|
|
| - yyerror_range[2] = yylloc;
|
| + yyerror_range[1] = yylloc;
|
| /* Using YYLLOC is tempting, but would change the location of
|
| the lookahead. YYLOC is available though. */
|
| - YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
|
| + YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
|
| *++yylsp = yyloc;
|
|
|
| /* Shift the error token. */
|
| @@ -2878,8 +2904,8 @@ yyreturn:
|
|
|
|
|
|
|
| -/* Line 1684 of yacc.c */
|
| -#line 550 "glcpp/glcpp-parse.y"
|
| +/* Line 1675 of yacc.c */
|
| +#line 558 "third_party/mesa/MesaLib/src/glsl/glcpp/glcpp-parse.y"
|
|
|
|
|
| string_list_t *
|
|
|