X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fglsl%2Fglsl_parser.h;h=1bf3b3538c7157c01192c01a3d9407b6ebace217;hb=42fd9c2ebb8a9eecf69d6a7a2bc0d778f49285de;hp=48a0a5fb3a31cbf398c78984cbff71863be8c008;hpb=768b55a5268572ff9fd03e57e92775882eb0a821;p=mesa.git

diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h
index 48a0a5fb3a3..1bf3b3538c7 100644
--- a/src/glsl/glsl_parser.h
+++ b/src/glsl/glsl_parser.h
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 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
@@ -148,82 +147,88 @@
      VERSION = 364,
      EXTENSION = 365,
      LINE = 366,
-     PRAGMA = 367,
-     COLON = 368,
-     EOL = 369,
-     INTERFACE = 370,
-     OUTPUT = 371,
-     LAYOUT_TOK = 372,
-     ASM = 373,
-     CLASS = 374,
-     UNION = 375,
-     ENUM = 376,
-     TYPEDEF = 377,
-     TEMPLATE = 378,
-     THIS = 379,
-     PACKED_TOK = 380,
-     GOTO = 381,
-     INLINE_TOK = 382,
-     NOINLINE = 383,
-     VOLATILE = 384,
-     PUBLIC_TOK = 385,
-     STATIC = 386,
-     EXTERN = 387,
-     EXTERNAL = 388,
-     LONG_TOK = 389,
-     SHORT_TOK = 390,
-     DOUBLE_TOK = 391,
-     HALF = 392,
-     FIXED_TOK = 393,
-     UNSIGNED = 394,
-     INPUT_TOK = 395,
-     OUPTUT = 396,
-     HVEC2 = 397,
-     HVEC3 = 398,
-     HVEC4 = 399,
-     DVEC2 = 400,
-     DVEC3 = 401,
-     DVEC4 = 402,
-     FVEC2 = 403,
-     FVEC3 = 404,
-     FVEC4 = 405,
-     SAMPLER2DRECT = 406,
-     SAMPLER3DRECT = 407,
-     SAMPLER2DRECTSHADOW = 408,
-     SIZEOF = 409,
-     CAST = 410,
-     NAMESPACE = 411,
-     USING = 412,
-     ERROR_TOK = 413,
-     COMMON = 414,
-     PARTITION = 415,
-     ACTIVE = 416,
-     SAMPLERBUFFER = 417,
-     FILTER = 418,
-     IMAGE1D = 419,
-     IMAGE2D = 420,
-     IMAGE3D = 421,
-     IMAGECUBE = 422,
-     IMAGE1DARRAY = 423,
-     IMAGE2DARRAY = 424,
-     IIMAGE1D = 425,
-     IIMAGE2D = 426,
-     IIMAGE3D = 427,
-     IIMAGECUBE = 428,
-     IIMAGE1DARRAY = 429,
-     IIMAGE2DARRAY = 430,
-     UIMAGE1D = 431,
-     UIMAGE2D = 432,
-     UIMAGE3D = 433,
-     UIMAGECUBE = 434,
-     UIMAGE1DARRAY = 435,
-     UIMAGE2DARRAY = 436,
-     IMAGE1DSHADOW = 437,
-     IMAGE2DSHADOW = 438,
-     IMAGEBUFFER = 439,
-     IIMAGEBUFFER = 440,
-     UIMAGEBUFFER = 441,
-     ROW_MAJOR = 442
+     COLON = 367,
+     EOL = 368,
+     INTERFACE = 369,
+     OUTPUT = 370,
+     PRAGMA_DEBUG_ON = 371,
+     PRAGMA_DEBUG_OFF = 372,
+     PRAGMA_OPTIMIZE_ON = 373,
+     PRAGMA_OPTIMIZE_OFF = 374,
+     PRAGMA_INVARIANT_ALL = 375,
+     LAYOUT_TOK = 376,
+     ASM = 377,
+     CLASS = 378,
+     UNION = 379,
+     ENUM = 380,
+     TYPEDEF = 381,
+     TEMPLATE = 382,
+     THIS = 383,
+     PACKED_TOK = 384,
+     GOTO = 385,
+     INLINE_TOK = 386,
+     NOINLINE = 387,
+     VOLATILE = 388,
+     PUBLIC_TOK = 389,
+     STATIC = 390,
+     EXTERN = 391,
+     EXTERNAL = 392,
+     LONG_TOK = 393,
+     SHORT_TOK = 394,
+     DOUBLE_TOK = 395,
+     HALF = 396,
+     FIXED_TOK = 397,
+     UNSIGNED = 398,
+     INPUT_TOK = 399,
+     OUPTUT = 400,
+     HVEC2 = 401,
+     HVEC3 = 402,
+     HVEC4 = 403,
+     DVEC2 = 404,
+     DVEC3 = 405,
+     DVEC4 = 406,
+     FVEC2 = 407,
+     FVEC3 = 408,
+     FVEC4 = 409,
+     SAMPLER2DRECT = 410,
+     SAMPLER3DRECT = 411,
+     SAMPLER2DRECTSHADOW = 412,
+     SIZEOF = 413,
+     CAST = 414,
+     NAMESPACE = 415,
+     USING = 416,
+     ERROR_TOK = 417,
+     COMMON = 418,
+     PARTITION = 419,
+     ACTIVE = 420,
+     SAMPLERBUFFER = 421,
+     FILTER = 422,
+     IMAGE1D = 423,
+     IMAGE2D = 424,
+     IMAGE3D = 425,
+     IMAGECUBE = 426,
+     IMAGE1DARRAY = 427,
+     IMAGE2DARRAY = 428,
+     IIMAGE1D = 429,
+     IIMAGE2D = 430,
+     IIMAGE3D = 431,
+     IIMAGECUBE = 432,
+     IIMAGE1DARRAY = 433,
+     IIMAGE2DARRAY = 434,
+     UIMAGE1D = 435,
+     UIMAGE2D = 436,
+     UIMAGE3D = 437,
+     UIMAGECUBE = 438,
+     UIMAGE1DARRAY = 439,
+     UIMAGE2DARRAY = 440,
+     IMAGE1DSHADOW = 441,
+     IMAGE2DSHADOW = 442,
+     IMAGEBUFFER = 443,
+     IIMAGEBUFFER = 444,
+     UIMAGEBUFFER = 445,
+     IMAGE1DARRAYSHADOW = 446,
+     IMAGE2DARRAYSHADOW = 447,
+     ROW_MAJOR = 448
    };
 #endif
 
@@ -233,17 +238,14 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
+/* Line 1685 of yacc.c  */
 #line 52 "glsl_parser.ypp"
 
    int n;
    float real;
    char *identifier;
 
-   union {
-      struct ast_type_qualifier q;
-      unsigned i;
-   } type_qualifier;
+   struct ast_type_qualifier type_qualifier;
 
    ast_node *node;
    ast_type_specifier *type_specifier;
@@ -262,10 +264,15 @@ typedef union YYSTYPE
       ast_expression *rest;
    } for_rest_statement;
 
+   struct {
+      ast_node *then_statement;
+      ast_node *else_statement;
+   } selection_rest_statement;
+
 
 
-/* Line 1676 of yacc.c  */
-#line 269 "glsl_parser.h"
+/* Line 1685 of yacc.c  */
+#line 276 "glsl_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */