Difference for common/loader.c from version 1.79 to 1.80

version 1.79 version 1.80
Line 8
 
Line 8
 #define FLEX_SCANNER  #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2  #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5  #define YY_FLEX_MINOR_VERSION 5
 #define YY_FLEX_SUBMINOR_VERSION 31  #define YY_FLEX_SUBMINOR_VERSION 33
 #if YY_FLEX_SUBMINOR_VERSION > 0  #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA  #define FLEX_BETA
 #endif  #endif
Line 30
 
Line 30
   
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */  /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
   
 #if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L  #if __STDC_VERSION__ >= 199901L
   
   /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
    * if you want the limit (max/min) macros for int types.
    */
   #ifndef __STDC_LIMIT_MACROS
   #define __STDC_LIMIT_MACROS 1
   #endif
   
 #include <inttypes.h>  #include <inttypes.h>
 typedef int8_t flex_int8_t;  typedef int8_t flex_int8_t;
 typedef uint8_t flex_uint8_t;  typedef uint8_t flex_uint8_t;
Line 134
 
Line 142
 #define YY_BUF_SIZE 16384  #define YY_BUF_SIZE 16384
 #endif  #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))
   
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE  #ifndef YY_TYPEDEF_YY_BUFFER_STATE
 #define YY_TYPEDEF_YY_BUFFER_STATE  #define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;  typedef struct yy_buffer_state *YY_BUFFER_STATE;
Line 267
 
Line 279
   
 /* Points to current character in buffer. */  /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;  static char *yy_c_buf_p = (char *) 0;
 static int yy_init = 1; /* whether we need to initialize */  static int yy_init = 0; /* whether we need to initialize */
 static int yy_start = 0; /* start state number */  static int yy_start = 0; /* start state number */
   
 /* Flag which is used to allow yywrap()'s to do buffer switches  /* Flag which is used to allow yywrap()'s to do buffer switches
Line 1947
 
Line 1959
 #line 2 "loader.l"  #line 2 "loader.l"
 /*  /*
  * static char *rcsid_object_c =   * static char *rcsid_object_c =
  *   "$Id: loader.c,v 1.79 2006/02/27 20:12:44 akirschbaum Exp $";   *   "$Id: loader.c,v 1.80 2006/03/18 15:05:31 ryo_saeba Exp $";
  */   */
   
 /*  /*
Line 2539
 
Line 2551
   
 /* Don't have to link with -lfl with this */  /* Don't have to link with -lfl with this */
 /* need yy_push_state, yy_pop_state */  /* need yy_push_state, yy_pop_state */
 #line 2543 "loader.c"  #line 2555 "loader.c"
   
 #define INITIAL 0  #define INITIAL 0
 #define MESSAGE 1  #define MESSAGE 1
Line 2558
 
Line 2570
 #define YY_EXTRA_TYPE void *  #define YY_EXTRA_TYPE void *
 #endif  #endif
   
   static int yy_init_globals (void );
   
 /* Macros after this point can all be overridden by user definitions in  /* Macros after this point can all be overridden by user definitions in
  * section 1.   * section 1.
  */   */
Line 2592
 
Line 2606
   
         static int yy_start_stack_ptr = 0;          static int yy_start_stack_ptr = 0;
         static int yy_start_stack_depth = 0;          static int yy_start_stack_depth = 0;
         static int *yy_start_stack = 0;          static int *yy_start_stack = NULL;
          
     static void yy_push_state (int new_state );      static void yy_push_state (int new_state );
          
Line 2717
 
Line 2731
   
   
   
 #line 2721 "loader.c"  #line 2735 "loader.c"
   
  if ( (yy_init) )   if ( !(yy_init) )
  {   {
  (yy_init) = 0;   (yy_init) = 1;
   
 #ifdef YY_USER_INIT  #ifdef YY_USER_INIT
  YY_USER_INIT;   YY_USER_INIT;
Line 3065
 
Line 3079
 case 28:  case 28:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 760 "loader.l"  #line 760 "loader.l"
 op->face = &new_faces[FindFace(yval(), 0)];  op->face = &new_faces[find_face(yval(), 0)];
  YY_BREAK   YY_BREAK
 case 29:  case 29:
 YY_RULE_SETUP  YY_RULE_SETUP
Line 4585
 
Line 4599
 #line 1314 "loader.l"  #line 1314 "loader.l"
 ECHO;  ECHO;
  YY_BREAK   YY_BREAK
 #line 4589 "loader.c"  #line 4603 "loader.c"
   
  case YY_END_OF_BUFFER:   case YY_END_OF_BUFFER:
  {   {
Line 4769
 
Line 4783
   
  else   else
  {   {
  size_t num_to_read =   int num_to_read =
  YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;   YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
   
  while ( num_to_read <= 0 )   while ( num_to_read <= 0 )
Line 5128
 
Line 5142
  yyfree((void *) b  );   yyfree((void *) b  );
 }  }
   
 #ifndef __cplusplus  #ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
   #ifdef __cplusplus
   extern "C" {
   #endif
   #ifdef __THROW /* this is a gnuism */
   extern int isatty (int ) __THROW;
   #else
 extern int isatty (int );  extern int isatty (int );
 #endif /* __cplusplus */  #endif
   #ifdef __cplusplus
   }
   #endif
   #endif
          
 /* Initializes or reinitializes a buffer.  /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,   * This function is sometimes called more than once on the same buffer,
Line 5324
 
Line 5348
  * @note If you want to scan bytes that may contain NUL values, then use   * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.   *       yy_scan_bytes() instead.
  */   */
 YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )  YY_BUFFER_STATE yy_scan_string (yyconst char * __yystr )
 {  {
          
  return yy_scan_bytes(yy_str,strlen(yy_str) );   return yy_scan_bytes(__yystr,strlen(__yystr) );
 }  }
   
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will  /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
Line 5337
 
Line 5361
  *    *
  * @return the newly allocated buffer state object.   * @return the newly allocated buffer state object.
  */   */
 YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )  YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {  {
  YY_BUFFER_STATE b;   YY_BUFFER_STATE b;
  char *buf;   char *buf;
Line 5345
 
Line 5369
  int i;   int i;
          
  /* Get memory for full buffer, including space for trailing EOB's. */   /* Get memory for full buffer, including space for trailing EOB's. */
  n = len + 2;   n = _yybytes_len + 2;
  buf = (char *) yyalloc(n  );   buf = (char *) yyalloc(n  );
  if ( ! buf )   if ( ! buf )
  YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );   YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
   
  for ( i = 0; i < len; ++i )   for ( i = 0; i < _yybytes_len; ++i )
  buf[i] = bytes[i];   buf[i] = yybytes[i];
   
  buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;   buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
   
  b = yy_scan_buffer(buf,n );   b = yy_scan_buffer(buf,n );
  if ( ! b )   if ( ! b )
Line 5512
 
Line 5536
         yy_flex_debug = bdebug ;          yy_flex_debug = bdebug ;
 }  }
   
   static int yy_init_globals (void)
   {
           /* Initialization is the same as for the non-reentrant scanner.
        * This function is called from yylex_destroy(), so don't allocate here.
        */
   
       (yy_buffer_stack) = 0;
       (yy_buffer_stack_top) = 0;
       (yy_buffer_stack_max) = 0;
       (yy_c_buf_p) = (char *) 0;
       (yy_init) = 0;
       (yy_start) = 0;
   
       (yy_start_stack_ptr) = 0;
       (yy_start_stack_depth) = 0;
       (yy_start_stack) =  NULL;
   
   /* Defined in main.c */
   #ifdef YY_STDINIT
       yyin = stdin;
       yyout = stdout;
   #else
       yyin = (FILE *) 0;
       yyout = (FILE *) 0;
   #endif
   
       /* For future reference: Set errno on error, since we are called by
        * yylex_init()
        */
       return 0;
   }
   
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */  /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)  int yylex_destroy  (void)
 {  {
Line 5531
 
Line 5587
         yyfree((yy_start_stack)  );          yyfree((yy_start_stack)  );
         (yy_start_stack) = NULL;          (yy_start_stack) = NULL;
   
       /* Reset the globals. This is important in a non-reentrant scanner so the next time
        * yylex() is called, initialization will occur. */
       yy_init_globals( );
   
     return 0;      return 0;
 }  }
   
Line 5582
 
Line 5642
   
 #define YYTABLES_NAME "yytables"  #define YYTABLES_NAME "yytables"
   
 #undef YY_NEW_FILE  
 #undef YY_FLUSH_BUFFER  
 #undef yy_set_bol  
 #undef yy_new_buffer  
 #undef yy_set_interactive  
 #undef yytext_ptr  
 #undef YY_DO_BEFORE_ACTION  
   
 #ifdef YY_DECL_IS_OURS  
 #undef YY_DECL_IS_OURS  
 #undef YY_DECL  
 #endif  
 #line 1314 "loader.l"  #line 1314 "loader.l"
   
   

Legend:
line(s) removed in v.1.79 
line(s) changed
 line(s) added in v.1.80
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:09