diff options
| author | Kenneth Graunke <[email protected]> | 2010-09-07 12:56:18 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2010-09-07 13:17:05 -0700 |
| commit | 0427228bbc241d0b76df853812d023273b496637 (patch) | |
| tree | 0dd7e979d74d0e6c6c178f8780e1da92dd14c1f6 /src/glsl/glsl_parser.h | |
| parent | 24c12e6c7f8aa8c2f4c163d23d740b070bfabfc3 (diff) | |
glsl: Change grammar rules for selection statements to match the spec.
Fixes piglit test case loop-06.vert.
Unfortunately, causes 1 shift/reduce conflict.
Diffstat (limited to 'src/glsl/glsl_parser.h')
| -rw-r--r-- | src/glsl/glsl_parser.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h index 3ed90853adf..4a780375bfa 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 @@ -236,7 +235,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 1685 of yacc.c */ #line 52 "glsl_parser.ypp" int n; @@ -265,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 272 "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 */ |