|
|
@@ -47,7 +47,6 @@ typedef int16_t flex_int16_t;
|
|
|
typedef uint16_t flex_uint16_t;
|
|
|
typedef int32_t flex_int32_t;
|
|
|
typedef uint32_t flex_uint32_t;
|
|
|
-typedef uint64_t flex_uint64_t;
|
|
|
#else
|
|
|
typedef signed char flex_int8_t;
|
|
|
typedef short int flex_int16_t;
|
|
|
@@ -55,7 +54,6 @@ 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
|
|
|
@@ -86,6 +84,8 @@ typedef unsigned int flex_uint32_t;
|
|
|
#define UINT32_MAX (4294967295U)
|
|
|
#endif
|
|
|
|
|
|
+#endif /* ! C99 */
|
|
|
+
|
|
|
#endif /* ! FLEXINT_H */
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
@@ -159,7 +159,15 @@ 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.
|
|
|
@@ -171,11 +179,6 @@ typedef void* yyscan_t;
|
|
|
typedef struct yy_buffer_state *YY_BUFFER_STATE;
|
|
|
#endif
|
|
|
|
|
|
-#ifndef YY_TYPEDEF_YY_SIZE_T
|
|
|
-#define YY_TYPEDEF_YY_SIZE_T
|
|
|
-typedef size_t yy_size_t;
|
|
|
-#endif
|
|
|
-
|
|
|
#define EOB_ACT_CONTINUE_SCAN 0
|
|
|
#define EOB_ACT_END_OF_FILE 1
|
|
|
#define EOB_ACT_LAST_MATCH 2
|
|
|
@@ -198,6 +201,11 @@ typedef size_t yy_size_t;
|
|
|
|
|
|
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
|
|
|
|
|
|
+#ifndef YY_TYPEDEF_YY_SIZE_T
|
|
|
+#define YY_TYPEDEF_YY_SIZE_T
|
|
|
+typedef size_t yy_size_t;
|
|
|
+#endif
|
|
|
+
|
|
|
#ifndef YY_STRUCT_YY_BUFFER_STATE
|
|
|
#define YY_STRUCT_YY_BUFFER_STATE
|
|
|
struct yy_buffer_state
|
|
|
@@ -215,7 +223,7 @@ struct yy_buffer_state
|
|
|
/* Number of characters read into yy_ch_buf, not including EOB
|
|
|
* characters.
|
|
|
*/
|
|
|
- yy_size_t yy_n_chars;
|
|
|
+ int yy_n_chars;
|
|
|
|
|
|
/* Whether we "own" the buffer - i.e., we know we created it,
|
|
|
* and can realloc() it to grow it, and should free() it to
|
|
|
@@ -294,7 +302,7 @@ static void glcpp__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner
|
|
|
|
|
|
YY_BUFFER_STATE glcpp__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
|
|
|
YY_BUFFER_STATE glcpp__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
|
|
|
-YY_BUFFER_STATE glcpp__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
|
|
|
+YY_BUFFER_STATE glcpp__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
|
|
|
|
|
|
void *glcpp_alloc (yy_size_t ,yyscan_t yyscanner );
|
|
|
void *glcpp_realloc (void *,yy_size_t ,yyscan_t yyscanner );
|
|
|
@@ -345,7 +353,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
|
|
|
*/
|
|
|
#define YY_DO_BEFORE_ACTION \
|
|
|
yyg->yytext_ptr = yy_bp; \
|
|
|
- yyleng = (yy_size_t) (yy_cp - yy_bp); \
|
|
|
+ yyleng = (size_t) (yy_cp - yy_bp); \
|
|
|
yyg->yy_hold_char = *yy_cp; \
|
|
|
*yy_cp = '\0'; \
|
|
|
yyg->yy_c_buf_p = yy_cp;
|
|
|
@@ -629,7 +637,7 @@ match longer strings take priority over those matching shorter
|
|
|
strings, we have to be careful to avoid OTHER matching and hiding
|
|
|
something that CPP does care about. So we simply exclude all
|
|
|
characters that appear in any other expressions. */
|
|
|
-#line 633 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
+#line 641 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
|
|
|
#define INITIAL 0
|
|
|
#define DONE 1
|
|
|
@@ -654,8 +662,8 @@ struct yyguts_t
|
|
|
size_t yy_buffer_stack_max; /**< capacity of stack. */
|
|
|
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
|
|
|
char yy_hold_char;
|
|
|
- yy_size_t yy_n_chars;
|
|
|
- yy_size_t yyleng_r;
|
|
|
+ int yy_n_chars;
|
|
|
+ int yyleng_r;
|
|
|
char *yy_c_buf_p;
|
|
|
int yy_init;
|
|
|
int yy_start;
|
|
|
@@ -712,7 +720,7 @@ FILE *glcpp_get_out (yyscan_t yyscanner );
|
|
|
|
|
|
void glcpp_set_out (FILE * out_str ,yyscan_t yyscanner );
|
|
|
|
|
|
-yy_size_t glcpp_get_leng (yyscan_t yyscanner );
|
|
|
+int glcpp_get_leng (yyscan_t yyscanner );
|
|
|
|
|
|
char *glcpp_get_text (yyscan_t yyscanner );
|
|
|
|
|
|
@@ -768,7 +776,12 @@ 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. */
|
|
|
@@ -776,7 +789,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 fwrite( yytext, yyleng, 1, yyout )
|
|
|
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
|
|
#endif
|
|
|
|
|
|
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
|
|
@@ -787,7 +800,7 @@ static int input (yyscan_t yyscanner );
|
|
|
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
|
|
{ \
|
|
|
int c = '*'; \
|
|
|
- yy_size_t n; \
|
|
|
+ size_t n; \
|
|
|
for ( n = 0; n < max_size && \
|
|
|
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
|
|
buf[n] = (char) c; \
|
|
|
@@ -939,7 +952,7 @@ YY_DECL
|
|
|
}
|
|
|
|
|
|
/* Single-line comments */
|
|
|
-#line 943 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
+#line 956 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
|
|
|
yylval = yylval_param;
|
|
|
|
|
|
@@ -1392,7 +1405,7 @@ YY_RULE_SETUP
|
|
|
#line 375 "src/glsl/glcpp/glcpp-lex.l"
|
|
|
ECHO;
|
|
|
YY_BREAK
|
|
|
-#line 1396 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
+#line 1409 "src/glsl/glcpp/glcpp-lex.c"
|
|
|
case YY_STATE_EOF(DONE):
|
|
|
case YY_STATE_EOF(COMMENT):
|
|
|
case YY_STATE_EOF(UNREACHABLE):
|
|
|
@@ -1585,7 +1598,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
|
|
|
else
|
|
|
{
|
|
|
- yy_size_t num_to_read =
|
|
|
+ int num_to_read =
|
|
|
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
|
|
|
|
|
|
while ( num_to_read <= 0 )
|
|
|
@@ -1599,7 +1612,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
|
|
|
if ( b->yy_is_our_buffer )
|
|
|
{
|
|
|
- yy_size_t new_size = b->yy_buf_size * 2;
|
|
|
+ int new_size = b->yy_buf_size * 2;
|
|
|
|
|
|
if ( new_size <= 0 )
|
|
|
b->yy_buf_size += b->yy_buf_size / 8;
|
|
|
@@ -1630,7 +1643,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
|
|
|
/* Read in more data. */
|
|
|
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
|
|
|
- yyg->yy_n_chars, num_to_read );
|
|
|
+ yyg->yy_n_chars, (size_t) num_to_read );
|
|
|
|
|
|
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
|
|
|
}
|
|
|
@@ -1744,7 +1757,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
|
|
|
{ /* need to shift things up to make room */
|
|
|
/* +2 for EOB chars. */
|
|
|
- register yy_size_t number_to_move = yyg->yy_n_chars + 2;
|
|
|
+ register int number_to_move = yyg->yy_n_chars + 2;
|
|
|
register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
|
|
|
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
|
|
|
register char *source =
|
|
|
@@ -1794,7 +1807,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
|
|
|
else
|
|
|
{ /* need more input */
|
|
|
- yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
|
|
|
+ int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
|
|
|
++yyg->yy_c_buf_p;
|
|
|
|
|
|
switch ( yy_get_next_buffer( yyscanner ) )
|
|
|
@@ -1818,7 +1831,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
|
|
|
case EOB_ACT_END_OF_FILE:
|
|
|
{
|
|
|
if ( glcpp_wrap(yyscanner ) )
|
|
|
- return 0;
|
|
|
+ return EOF;
|
|
|
|
|
|
if ( ! yyg->yy_did_buffer_switch_on_eof )
|
|
|
YY_NEW_FILE;
|
|
|
@@ -2076,7 +2089,7 @@ void glcpp_pop_buffer_state (yyscan_t yyscanner)
|
|
|
*/
|
|
|
static void glcpp_ensure_buffer_stack (yyscan_t yyscanner)
|
|
|
{
|
|
|
- yy_size_t num_to_alloc;
|
|
|
+ int num_to_alloc;
|
|
|
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
|
|
|
|
|
if (!yyg->yy_buffer_stack) {
|
|
|
@@ -2169,16 +2182,17 @@ 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 bytes the byte buffer to scan
|
|
|
- * @param len the number of bytes in the buffer pointed to by @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 yyscanner The scanner object.
|
|
|
* @return the newly allocated buffer state object.
|
|
|
*/
|
|
|
-YY_BUFFER_STATE glcpp__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
|
|
|
+YY_BUFFER_STATE glcpp__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
|
|
|
{
|
|
|
YY_BUFFER_STATE b;
|
|
|
char *buf;
|
|
|
- yy_size_t n, i;
|
|
|
+ yy_size_t n;
|
|
|
+ int i;
|
|
|
|
|
|
/* Get memory for full buffer, including space for trailing EOB's. */
|
|
|
n = _yybytes_len + 2;
|
|
|
@@ -2328,7 +2342,7 @@ FILE *glcpp_get_out (yyscan_t yyscanner)
|
|
|
/** Get the length of the current token.
|
|
|
* @param yyscanner The scanner object.
|
|
|
*/
|
|
|
-yy_size_t glcpp_get_leng (yyscan_t yyscanner)
|
|
|
+int glcpp_get_leng (yyscan_t yyscanner)
|
|
|
{
|
|
|
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
|
|
return yyleng;
|
bkaradzic