Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1353)

Side by Side Diff: third_party/mesa/MesaLib/src/glsl/glsl_parser.h

Issue 11344041: Revert 165006 - Revert 165005 until skia_webkit.gyp is present everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* A Bison parser, made by GNU Bison 2.5. */ 1 /* A Bison parser, made by GNU Bison 2.4.3. */
2 2
3 /* Bison interface for Yacc-like parsers in C 3 /* Skeleton interface for Bison's Yacc-like parsers in C
4 4
5 Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. 5 Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
6 2009, 2010 Free Software Foundation, Inc.
6 7
7 This program is free software: you can redistribute it and/or modify 8 This program is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation, either version 3 of the License, or 10 the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 (at your option) any later version.
11 12
12 This program is distributed in the hope that it will be useful, 13 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 GNU General Public License for more details.
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 ROW_MAJOR = 445 228 ROW_MAJOR = 445
228 }; 229 };
229 #endif 230 #endif
230 231
231 232
232 233
233 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED 234 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
234 typedef union YYSTYPE 235 typedef union YYSTYPE
235 { 236 {
236 237
237 /* Line 2068 of yacc.c */ 238 /* Line 1685 of yacc.c */
238 #line 52 "glsl_parser.ypp" 239 #line 52 "glsl_parser.ypp"
239 240
240 int n; 241 int n;
241 float real; 242 float real;
242 char *identifier; 243 char *identifier;
243 244
244 union { 245 union {
245 struct ast_type_qualifier q; 246 struct ast_type_qualifier q;
246 unsigned i; 247 unsigned i;
247 } type_qualifier; 248 } type_qualifier;
(...skipping 15 matching lines...) Expand all
263 ast_expression *rest; 264 ast_expression *rest;
264 } for_rest_statement; 265 } for_rest_statement;
265 266
266 struct { 267 struct {
267 ast_node *then_statement; 268 ast_node *then_statement;
268 ast_node *else_statement; 269 ast_node *else_statement;
269 } selection_rest_statement; 270 } selection_rest_statement;
270 271
271 272
272 273
273 /* Line 2068 of yacc.c */ 274 /* Line 1685 of yacc.c */
274 #line 275 "glsl_parser.h" 275 #line 276 "glsl_parser.h"
275 } YYSTYPE; 276 } YYSTYPE;
276 # define YYSTYPE_IS_TRIVIAL 1 277 # define YYSTYPE_IS_TRIVIAL 1
277 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ 278 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
278 # define YYSTYPE_IS_DECLARED 1 279 # define YYSTYPE_IS_DECLARED 1
279 #endif 280 #endif
280 281
281 282
282 283
283 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED 284 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
284 typedef struct YYLTYPE 285 typedef struct YYLTYPE
285 { 286 {
286 int first_line; 287 int first_line;
287 int first_column; 288 int first_column;
288 int last_line; 289 int last_line;
289 int last_column; 290 int last_column;
290 } YYLTYPE; 291 } YYLTYPE;
291 # define yyltype YYLTYPE /* obsolescent; will be withdrawn */ 292 # define yyltype YYLTYPE /* obsolescent; will be withdrawn */
292 # define YYLTYPE_IS_DECLARED 1 293 # define YYLTYPE_IS_DECLARED 1
293 # define YYLTYPE_IS_TRIVIAL 1 294 # define YYLTYPE_IS_TRIVIAL 1
294 #endif 295 #endif
295 296
296 297
297 298
OLDNEW
« no previous file with comments | « third_party/mesa/MesaLib/src/glsl/glsl_lexer.cpp ('k') | third_party/mesa/MesaLib/src/glsl/glsl_parser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698