Regenerate with newest flex, so that new gcc paranoia get dealt with

[simgrid.git] / src / surf / simgrid_dtd.c

diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c
index ff4fcd6..a346ea7 100644 (file)
--- a/src/surf/simgrid_dtd.c
+++ b/src/surf/simgrid_dtd.c
@@ -27,7 +27,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5

-#define YY_FLEX_SUBMINOR_VERSION 34
+#define YY_FLEX_SUBMINOR_VERSION 35

 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif


@@ -39,11 +39,9 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>

-

 #ifdef WIN32
 #include <io.h>
 #endif
 #ifdef WIN32
 #include <io.h>
 #endif

-

 /* end standard C headers. */
 
 /* flex integer type definitions */
 /* end standard C headers. */
 
 /* flex integer type definitions */


@@ -76,7 +74,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;
 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
 
 /* Limits of integral types. */
 #ifndef INT8_MIN


@@ -107,6 +104,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
 #define UINT32_MAX             (4294967295U)
 #endif
 

+#endif /* ! C99 */
+

 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus


@@ -214,13 +213,6 @@ extern FILE *surf_parse_in, *surf_parse_out;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 

-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- * Given that the standard has decreed that size_t exists since 1989,
- * I guess we can afford to depend on it. Manoj.
- */
-

 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
 typedef size_t yy_size_t;
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
 typedef size_t yy_size_t;


@@ -374,11 +366,7 @@ void surf_parse_free (void *  );
 
 /* Begin user sect3 */
 
 
 /* Begin user sect3 */
 

-#ifndef WIN32

 #define surf_parse_wrap(n) 1
 #define surf_parse_wrap(n) 1

-#else
-#define surf_parse_wrap() 1
-#endif

 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;


@@ -3265,6 +3253,35 @@ const char* *surfxml_statenames=NULL;
 
 static int yy_init_globals (void );
 
 
 static int yy_init_globals (void );
 

+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int surf_parse_lex_destroy (void );
+
+int surf_parse_get_debug (void );
+
+void surf_parse_set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE surf_parse_get_extra (void );
+
+void surf_parse_set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *surf_parse_get_in (void );
+
+void surf_parse_set_in  (FILE * in_str  );
+
+FILE *surf_parse_get_out (void );
+
+void surf_parse_set_out  (FILE * out_str  );
+
+int surf_parse_get_leng (void );
+
+char *surf_parse_get_text (void );
+
+int surf_parse_get_lineno (void );
+
+void surf_parse_set_lineno (int line_number  );
+

 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */


@@ -3313,7 +3330,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */

-#define ECHO fwrite( surf_parse_text, surf_parse_leng, 1, surf_parse_out )
+#define ECHO do { if (fwrite( surf_parse_text, surf_parse_leng, 1, surf_parse_out )) {} } while (0)

 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,


@@ -3324,7 +3341,7 @@ static int input (void );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \

-               int n; \
+               size_t n; \

                for ( n = 0; n < max_size && \
                             (c = getc( surf_parse_in )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \
                for ( n = 0; n < max_size && \
                             (c = getc( surf_parse_in )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \