glsl & glcpp: Refresh autogenerated lexer and parser files.

For the previous few commits.
This commit is contained in:
Ian Romanick 2011-01-19 10:46:15 -08:00
parent df033be3f7
commit 28d47fed61
6 changed files with 2665 additions and 2626 deletions

View file

@ -54,6 +54,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@ -159,15 +158,7 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@ -705,7 +696,7 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
yylloc->source = 0; \
} while(0)
#line 709 "glcpp/glcpp-lex.c"
#line 700 "glcpp/glcpp-lex.c"
#define INITIAL 0
#define DONE 1
@ -804,6 +795,10 @@ int glcpp_get_lineno (yyscan_t yyscanner );
void glcpp_set_lineno (int line_number ,yyscan_t yyscanner );
int glcpp_get_column (yyscan_t yyscanner );
void glcpp_set_column (int column_no ,yyscan_t yyscanner );
YYSTYPE * glcpp_get_lval (yyscan_t yyscanner );
void glcpp_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@ -852,12 +847,7 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@ -876,7 +866,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
size_t n; \
unsigned n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@ -968,7 +958,7 @@ YY_DECL
/* Single-line comments */
#line 972 "glcpp/glcpp-lex.c"
#line 962 "glcpp/glcpp-lex.c"
yylval = yylval_param;
@ -1485,7 +1475,7 @@ YY_RULE_SETUP
#line 319 "glcpp/glcpp-lex.l"
ECHO;
YY_BREAK
#line 1489 "glcpp/glcpp-lex.c"
#line 1479 "glcpp/glcpp-lex.c"
case YY_STATE_EOF(DONE):
case YY_STATE_EOF(COMMENT):
case YY_STATE_EOF(UNREACHABLE):
@ -2224,8 +2214,8 @@ YY_BUFFER_STATE glcpp__scan_string (yyconst char * yystr , yyscan_t yyscanner)
/** Setup the input buffer state to scan the given bytes. The next call to glcpp_lex() will
* scan from a @e copy of @a bytes.
* @param yybytes the byte buffer to scan
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* @param bytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/

File diff suppressed because it is too large Load diff

View file

@ -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

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
/* A Bison parser, made by GNU Bison 2.4.2. */
/* 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-2006, 2009-2010 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
@ -155,77 +155,78 @@
PRAGMA_DEBUG_OFF = 372,
PRAGMA_OPTIMIZE_ON = 373,
PRAGMA_OPTIMIZE_OFF = 374,
LAYOUT_TOK = 375,
ASM = 376,
CLASS = 377,
UNION = 378,
ENUM = 379,
TYPEDEF = 380,
TEMPLATE = 381,
THIS = 382,
PACKED_TOK = 383,
GOTO = 384,
INLINE_TOK = 385,
NOINLINE = 386,
VOLATILE = 387,
PUBLIC_TOK = 388,
STATIC = 389,
EXTERN = 390,
EXTERNAL = 391,
LONG_TOK = 392,
SHORT_TOK = 393,
DOUBLE_TOK = 394,
HALF = 395,
FIXED_TOK = 396,
UNSIGNED = 397,
INPUT_TOK = 398,
OUPTUT = 399,
HVEC2 = 400,
HVEC3 = 401,
HVEC4 = 402,
DVEC2 = 403,
DVEC3 = 404,
DVEC4 = 405,
FVEC2 = 406,
FVEC3 = 407,
FVEC4 = 408,
SAMPLER2DRECT = 409,
SAMPLER3DRECT = 410,
SAMPLER2DRECTSHADOW = 411,
SIZEOF = 412,
CAST = 413,
NAMESPACE = 414,
USING = 415,
ERROR_TOK = 416,
COMMON = 417,
PARTITION = 418,
ACTIVE = 419,
SAMPLERBUFFER = 420,
FILTER = 421,
IMAGE1D = 422,
IMAGE2D = 423,
IMAGE3D = 424,
IMAGECUBE = 425,
IMAGE1DARRAY = 426,
IMAGE2DARRAY = 427,
IIMAGE1D = 428,
IIMAGE2D = 429,
IIMAGE3D = 430,
IIMAGECUBE = 431,
IIMAGE1DARRAY = 432,
IIMAGE2DARRAY = 433,
UIMAGE1D = 434,
UIMAGE2D = 435,
UIMAGE3D = 436,
UIMAGECUBE = 437,
UIMAGE1DARRAY = 438,
UIMAGE2DARRAY = 439,
IMAGE1DSHADOW = 440,
IMAGE2DSHADOW = 441,
IMAGEBUFFER = 442,
IIMAGEBUFFER = 443,
UIMAGEBUFFER = 444,
ROW_MAJOR = 445
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,
ROW_MAJOR = 446
};
#endif
@ -272,7 +273,7 @@ typedef union YYSTYPE
/* Line 1685 of yacc.c */
#line 276 "glsl_parser.h"
#line 277 "glsl_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */