summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/glcpp-lex.c
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2010-08-11 13:13:41 -0700
committerCarl Worth <[email protected]>2010-08-11 14:38:03 -0700
commit5a6285cc862df35ef5275c3858f833e0807dee14 (patch)
treed1e8913ecd16174e2b628134243bb28a9fa816b5 /src/glsl/glcpp/glcpp-lex.c
parentbc64b8980803a5ba1cc91c63dc2ed1517db800c6 (diff)
glcpp: Regenerate glcpp-lex.c
After a recent change to glcpp-lex.l
Diffstat (limited to 'src/glsl/glcpp/glcpp-lex.c')
-rw-r--r--src/glsl/glcpp/glcpp-lex.c32
1 files changed, 23 insertions, 9 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.c b/src/glsl/glcpp/glcpp-lex.c
index d9769041351..bdb3b2c11b0 100644
--- a/src/glsl/glcpp/glcpp-lex.c
+++ b/src/glsl/glcpp/glcpp-lex.c
@@ -54,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
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -158,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.
@@ -680,9 +689,9 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
yylloc->first_line = yylineno; \
yycolumn += yyleng; \
} while(0);
-#define YY_USER_INIT yylineno = 0; yycolumn = 0;
+#define YY_USER_INIT yylineno = 1; yycolumn = 1;
-#line 686 "glcpp/glcpp-lex.c"
+#line 695 "glcpp/glcpp-lex.c"
#define INITIAL 0
#define DONE 1
@@ -837,7 +846,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. */
@@ -845,7 +859,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,
@@ -856,7 +870,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -948,7 +962,7 @@ YY_DECL
/* Single-line comments */
-#line 952 "glcpp/glcpp-lex.c"
+#line 966 "glcpp/glcpp-lex.c"
yylval = yylval_param;
@@ -1428,7 +1442,7 @@ YY_RULE_SETUP
#line 286 "glcpp/glcpp-lex.l"
ECHO;
YY_BREAK
-#line 1432 "glcpp/glcpp-lex.c"
+#line 1446 "glcpp/glcpp-lex.c"
case YY_STATE_EOF(DONE):
case YY_STATE_EOF(COMMENT):
case YY_STATE_EOF(UNREACHABLE):
@@ -2167,8 +2181,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 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.
*/