ARB prog parser: added (float) casts and regenerate files

This commit is contained in:
Brian Paul 2010-03-11 09:08:58 -07:00
parent 54af54277a
commit bff128ff9c
2 changed files with 16 additions and 30 deletions

View File

@ -53,6 +53,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
@ -83,8 +84,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@ -158,15 +157,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.
@ -1161,7 +1152,7 @@ handle_ident(struct asm_parser_state *state, const char *text, YYSTYPE *lval)
} while(0);
#define YY_EXTRA_TYPE struct asm_parser_state *
#line 1165 "lex.yy.c"
#line 1156 "lex.yy.c"
#define INITIAL 0
@ -1298,12 +1289,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. */
@ -1311,7 +1297,7 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@ -1322,7 +1308,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; \
@ -1410,7 +1396,7 @@ YY_DECL
#line 157 "program_lexer.l"
#line 1414 "lex.yy.c"
#line 1400 "lex.yy.c"
yylval = yylval_param;
@ -2212,7 +2198,7 @@ case 142:
YY_RULE_SETUP
#line 326 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2224,7 +2210,7 @@ YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
#line 330 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2232,7 +2218,7 @@ case 144:
YY_RULE_SETUP
#line 334 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2240,7 +2226,7 @@ case 145:
YY_RULE_SETUP
#line 338 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
@ -2474,7 +2460,7 @@ YY_RULE_SETUP
#line 481 "program_lexer.l"
ECHO;
YY_BREAK
#line 2478 "lex.yy.c"
#line 2464 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@ -3242,8 +3228,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
/** Setup the input buffer state to scan the given bytes. The next call to yylex() 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.
*/

View File

@ -324,19 +324,19 @@ ARRAYSHADOW2D { return_token_or_IDENTIFIER(require_ARB_fp && require
return INTEGER;
}
{num}?{frac}{exp}? {
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
{num}"."/[^.] {
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
{num}{exp} {
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}
{num}"."{exp} {
yylval->real = _mesa_strtod(yytext, NULL);
yylval->real = (float) _mesa_strtod(yytext, NULL);
return REAL;
}