Commit e768d4fa authored by Mukund Sivaraman's avatar Mukund Sivaraman

imagemap: Rebuild parsers (after .y update)

parent 03dfb95f
......@@ -27,7 +27,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_SUBMINOR_VERSION 36
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
......@@ -72,7 +72,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
......@@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
......@@ -171,7 +172,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
extern int cern_leng;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
extern yy_size_t cern_leng;
extern FILE *cern_in, *cern_out;
......@@ -197,11 +203,6 @@ extern FILE *cern_in, *cern_out;
#define unput(c) yyunput( c, (yytext_ptr) )
#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
......@@ -219,7 +220,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
yy_size_t 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
......@@ -289,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when cern_text is formed. */
static char yy_hold_char;
static int yy_n_chars; /* number of characters read into yy_ch_buf */
int cern_leng;
static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
yy_size_t cern_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
......@@ -318,7 +319,7 @@ static void cern__init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE cern__scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE cern__scan_string (yyconst char *yy_str );
YY_BUFFER_STATE cern__scan_bytes (yyconst char *bytes,int len );
YY_BUFFER_STATE cern__scan_bytes (yyconst char *bytes,yy_size_t len );
void *cern_alloc (yy_size_t );
void *cern_realloc (void *,yy_size_t );
......@@ -350,7 +351,7 @@ void cern_free (void * );
/* Begin user sect3 */
#define cern_wrap(n) 1
#define cern_wrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
......@@ -612,7 +613,7 @@ char *cern_text;
#define YY_NO_INPUT 1
#line 616 "<stdout>"
#line 617 "<stdout>"
#define INITIAL 0
#define comment 1
......@@ -652,7 +653,7 @@ FILE *cern_get_out (void );
void cern_set_out (FILE * out_str );
int cern_get_leng (void );
yy_size_t cern_get_leng (void );
char *cern_get_text (void );
......@@ -711,7 +712,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
unsigned n; \
size_t n; \
for ( n = 0; n < max_size && \
(c = getc( cern_in )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
......@@ -796,7 +797,7 @@ YY_DECL
#line 46 "imap_cern.l"
#line 800 "<stdout>"
#line 801 "<stdout>"
if ( !(yy_init) )
{
......@@ -973,7 +974,7 @@ YY_RULE_SETUP
#line 91 "imap_cern.l"
ECHO;
YY_BREAK
#line 977 "<stdout>"
#line 978 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(comment):
yyterminate();
......@@ -1160,21 +1161,21 @@ static int yy_get_next_buffer (void)
else
{
int num_to_read =
yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
int new_size = b->yy_buf_size * 2;
yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
......@@ -1205,7 +1206,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
(yy_n_chars), (size_t) num_to_read );
(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
......@@ -1300,7 +1301,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 93);
return yy_is_jam ? 0 : yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_INPUT
......@@ -1327,7 +1328,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
int offset = (yy_c_buf_p) - (yytext_ptr);
yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
......@@ -1487,10 +1488,6 @@ static void cern__load_buffer_state (void)
cern_free((void *) b );
}
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a cern_restart() or at EOF.
......@@ -1603,7 +1600,7 @@ void cern_pop_buffer_state (void)
*/
static void cern_ensure_buffer_stack (void)
{
int num_to_alloc;
yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
......@@ -1695,12 +1692,12 @@ YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to cern_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.
*
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, int _yybytes_len )
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
......@@ -1787,7 +1784,7 @@ FILE *cern_get_out (void)
/** Get the length of the current token.
*
*/
int cern_get_leng (void)
yy_size_t cern_get_leng (void)
{
return cern_leng;
}
......
This diff is collapsed.
/* A Bison parser, made by GNU Bison 2.4.3. */
/* A Bison parser, made by GNU Bison 2.6.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2009, 2010 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2012 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
......@@ -31,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef CERN_Y_TAB_H
# define CERN_Y_TAB_H
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int cern_debug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
......@@ -64,12 +72,10 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
/* Line 1685 of yacc.c */
/* Line 2049 of yacc.c */
#line 46 "imap_cern.y"
int val;
......@@ -77,9 +83,8 @@ typedef union YYSTYPE
char *id;
/* Line 1685 of yacc.c */
#line 83 "y.tab.h"
/* Line 2049 of yacc.c */
#line 88 "y.tab.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
......@@ -88,4 +93,18 @@ typedef union YYSTYPE
extern YYSTYPE cern_lval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int cern_parse (void *YYPARSE_PARAM);
#else
int cern_parse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int cern_parse (void);
#else
int cern_parse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !CERN_Y_TAB_H */
......@@ -27,7 +27,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_SUBMINOR_VERSION 36
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
......@@ -72,7 +72,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
......@@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
......@@ -171,7 +172,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
extern int csim_leng;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
extern yy_size_t csim_leng;
extern FILE *csim_in, *csim_out;
......@@ -197,11 +203,6 @@ extern FILE *csim_in, *csim_out;
#define unput(c) yyunput( c, (yytext_ptr) )
#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
......@@ -219,7 +220,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
yy_size_t 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
......@@ -289,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when csim_text is formed. */
static char yy_hold_char;
static int yy_n_chars; /* number of characters read into yy_ch_buf */
int csim_leng;
static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
yy_size_t csim_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
......@@ -318,7 +319,7 @@ static void csim__init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE csim__scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE csim__scan_string (yyconst char *yy_str );
YY_BUFFER_STATE csim__scan_bytes (yyconst char *bytes,int len );
YY_BUFFER_STATE csim__scan_bytes (yyconst char *bytes,yy_size_t len );
void *csim_alloc (yy_size_t );
void *csim_realloc (void *,yy_size_t );
......@@ -350,7 +351,7 @@ void csim_free (void * );
/* Begin user sect3 */
#define csim_wrap(n) 1
#define csim_wrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
......@@ -636,7 +637,7 @@ char *csim_text;
#define YY_NO_INPUT 1
#line 640 "<stdout>"
#line 641 "<stdout>"
#define INITIAL 0
#define quoted_string 1
......@@ -677,7 +678,7 @@ FILE *csim_get_out (void );
void csim_set_out (FILE * out_str );
int csim_get_leng (void );
yy_size_t csim_get_leng (void );
char *csim_get_text (void );
......@@ -736,7 +737,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
unsigned n; \
size_t n; \
for ( n = 0; n < max_size && \
(c = getc( csim_in )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
......@@ -821,7 +822,7 @@ YY_DECL
#line 47 "imap_csim.l"
#line 825 "<stdout>"
#line 826 "<stdout>"
if ( !(yy_init) )
{
......@@ -1094,7 +1095,7 @@ YY_RULE_SETUP
#line 136 "imap_csim.l"
ECHO;
YY_BREAK
#line 1098 "<stdout>"
#line 1099 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(quoted_string):
case YY_STATE_EOF(comment):
......@@ -1282,21 +1283,21 @@ static int yy_get_next_buffer (void)
else
{
int num_to_read =
yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
int new_size = b->yy_buf_size * 2;
yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
......@@ -1327,7 +1328,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
(yy_n_chars), (size_t) num_to_read );
(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
......@@ -1422,7 +1423,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 153);
return yy_is_jam ? 0 : yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_INPUT
......@@ -1449,7 +1450,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
int offset = (yy_c_buf_p) - (yytext_ptr);
yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
......@@ -1609,10 +1610,6 @@ static void csim__load_buffer_state (void)
csim_free((void *) b );
}
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a csim_restart() or at EOF.
......@@ -1725,7 +1722,7 @@ void csim_pop_buffer_state (void)
*/
static void csim_ensure_buffer_stack (void)
{
int num_to_alloc;
yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
......@@ -1817,12 +1814,12 @@ YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to csim_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.
*
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, int _yybytes_len )
YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
......@@ -1909,7 +1906,7 @@ FILE *csim_get_out (void)
/** Get the length of the current token.
*
*/
int csim_get_leng (void)
yy_size_t csim_get_leng (void)
{
return csim_leng;
}
......
This diff is collapsed.
/* A Bison parser, made by GNU Bison 2.4.3. */
/* A Bison parser, made by GNU Bison 2.6.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2009, 2010 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2012 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
......@@ -31,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef CSIM_Y_TAB_H
# define CSIM_Y_TAB_H
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int csim_debug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
......@@ -96,22 +104,19 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
/* Line 1685 of yacc.c */
#line 48 "imap_csim.y"
/* Line 2049 of yacc.c */
#line 49 "imap_csim.y"
int val;
double value;
char *id;
/* Line 1685 of yacc.c */
#line 115 "y.tab.h"
/* Line 2049 of yacc.c */
#line 120 "y.tab.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
......@@ -120,4 +125,18 @@ typedef union YYSTYPE
extern YYSTYPE csim_lval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int csim_parse (void *YYPARSE_PARAM);
#else
int csim_parse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int csim_parse (void);
#else
int csim_parse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !CSIM_Y_TAB_H */
......@@ -27,7 +27,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_SUBMINOR_VERSION 36
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
......@@ -72,7 +72,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
......@@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
......@@ -171,7 +172,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
extern int ncsa_leng;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
extern yy_size_t ncsa_leng;
extern FILE *ncsa_in, *ncsa_out;
......@@ -197,11 +203,6 @@ extern FILE *ncsa_in, *ncsa_out;
#define unput(c) yyunput( c, (yytext_ptr) )
#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
......@@ -219,7 +220,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
yy_size_t 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
......@@ -289,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when ncsa_text is formed. */
static char yy_hold_char;
static int yy_n_chars; /* number of characters read into yy_ch_buf */
int ncsa_leng;
static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
yy_size_t ncsa_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
......@@ -318,7 +319,7 @@ static void ncsa__init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE ncsa__scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE ncsa__scan_string (yyconst char *yy_str );
YY_BUFFER_STATE ncsa__scan_bytes (yyconst char *bytes,int len );
YY_BUFFER_STATE ncsa__scan_bytes (yyconst char *bytes,yy_size_t len );
void *ncsa_alloc (yy_size_t );
void *ncsa_realloc (void *,yy_size_t );
......@@ -350,7 +351,7 @@ void ncsa_free (void * );
/* Begin user sect3 */
#define ncsa_wrap(n) 1
#define ncsa_wrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
......@@ -576,7 +577,7 @@ char *ncsa_text;
#define YY_NO_INPUT 1
#line 580 "<stdout>"
#line 581 "<stdout>"
#define INITIAL 0
#define imap_link 1
......@@ -617,7 +618,7 @@ FILE *ncsa_get_out (void );
void ncsa_set_out (FILE * out_str );
int ncsa_get_leng (void );
yy_size_t ncsa_get_leng (void );
char *ncsa_get_text (void );
......@@ -676,7 +677,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
unsigned n; \
size_t n; \
for ( n = 0; n < max_size && \
(c = getc( ncsa_in )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
......@@ -761,7 +762,7 @@ YY_DECL
#line 47 "imap_ncsa.l"
#line 765 "<stdout>"
#line 766 "<stdout>"
if ( !(yy_init) )
{
......@@ -950,7 +951,7 @@ YY_RULE_SETUP
#line 110 "imap_ncsa.l"
ECHO;
YY_BREAK
#line 954 "<stdout>"
#line 955 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(imap_link):
case YY_STATE_EOF(comment):
......@@ -1138,21 +1139,21 @@ static int yy_get_next_buffer (void)
else
{
int num_to_read =
yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
int new_size = b->yy_buf_size * 2;
yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
......@@ -1183,7 +1184,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
(yy_n_chars), (size_t) num_to_read );
(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
......@@ -1278,7 +1279,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 75);
return yy_is_jam ? 0 : yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_INPUT
......@@ -1305,7 +1306,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
int offset = (yy_c_buf_p) - (yytext_ptr);
yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
......@@ -1465,10 +1466,6 @@ static void ncsa__load_buffer_state (void)