ext/libgecode3/vendor/gecode-3.7.3/gecode/flatzinc/lexer.yy.cpp in dep-selector-libgecode-1.0.0.alpha.1 vs ext/libgecode3/vendor/gecode-3.7.3/gecode/flatzinc/lexer.yy.cpp in dep-selector-libgecode-1.0.0.alpha.2
- old
+ new
@@ -52,11 +52,10 @@
typedef short int flex_int16_t;
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
#define INT8_MIN (-128)
#endif
@@ -83,10 +82,12 @@
#endif
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
@@ -156,11 +157,19 @@
#define YY_END_OF_BUFFER_CHAR 0
/* 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.
*/
#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
@@ -597,12 +606,12 @@
*
* Copyright:
* Guido Tack, 2007
*
* Last modified:
- * $Date: 2012-03-21 16:25:08 +1100 (Wed, 21 Mar 2012) $ by $Author: tack $
- * $Revision: 12605 $
+ * $Date: 2006-12-11 03:27:31 +1100 (Mon, 11 Dec 2006) $ by $Author: schulte $
+ * $Revision: 4024 $
*
* This file is part of Gecode, the generic constraint
* development environment:
* http://www.gecode.org
*
@@ -645,11 +654,11 @@
int stringbufpos;
int yy_input_proc(char* buf, int size, yyscan_t yyscanner);
#define YY_INPUT(buf, result, max_size) \
result = yy_input_proc(buf, max_size, yyscanner);
-#line 651 "gecode/flatzinc/lexer.yy.cpp"
+#line 660 "gecode/flatzinc/lexer.yy.cpp"
#define INITIAL 0
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -774,30 +783,35 @@
#endif
/* 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. */
#ifndef ECHO
/* 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,
* is returned in "result".
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
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; \
if ( c == '\n' ) \
buf[n++] = (char) c; \
@@ -881,11 +895,11 @@
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
#line 66 "./gecode/flatzinc/lexer.lxx"
-#line 887 "gecode/flatzinc/lexer.yy.cpp"
+#line 901 "gecode/flatzinc/lexer.yy.cpp"
yylval = yylval_param;
if ( !yyg->yy_init )
{
@@ -957,11 +971,11 @@
YY_DO_BEFORE_ACTION;
if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
{
- yy_size_t yyl;
+ int yyl;
for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' )
do{ yylineno++;
yycolumn=0;
@@ -1265,11 +1279,11 @@
case 56:
YY_RULE_SETUP
#line 130 "./gecode/flatzinc/lexer.lxx"
ECHO;
YY_BREAK
-#line 1271 "gecode/flatzinc/lexer.yy.cpp"
+#line 1285 "gecode/flatzinc/lexer.yy.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
case YY_END_OF_BUFFER:
{
@@ -2048,11 +2062,11 @@
return yy_scan_bytes(yystr,strlen(yystr) ,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 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 yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
{