debuggers.hg

changeset 22784:20b0f709153e

libxl: config parser: Rebuild config file parser scanner (rerun flex)

The scanner from c/s 22735:cb94dbe20f97 is buggy and crashes with a
segmentation fault. Rebuilding the sanner appears to fix the problem
so it appears that I somehow accidentally checked in a scanner which
doesn't correspond to the committed scanner source code.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Ian Jackson <Ian.Jackson@eu.citrix.com>
date Wed Jan 12 14:14:13 2011 +0000 (2011-01-12)
parents c3e478eafabc
children d839631b6048
files tools/libxl/libxlu_cfg_l.c
line diff
     1.1 --- a/tools/libxl/libxlu_cfg_l.c	Wed Jan 12 10:53:56 2011 +0000
     1.2 +++ b/tools/libxl/libxlu_cfg_l.c	Wed Jan 12 14:14:13 2011 +0000
     1.3 @@ -379,12 +379,12 @@ struct yy_trans_info
     1.4  	flex_int32_t yy_verify;
     1.5  	flex_int32_t yy_nxt;
     1.6  	};
     1.7 -static yyconst flex_int16_t yy_accept[34] =
     1.8 +static yyconst flex_int16_t yy_accept[35] =
     1.9      {   0,
    1.10 -        0,    0,   13,   13,   16,   12,    3,    9,   12,   12,
    1.11 -       12,    4,    2,    8,    7,    5,    6,    1,   13,   13,
    1.12 -       14,    0,   11,    0,    0,    9,    0,   10,    0,    2,
    1.13 -        1,   13,    0
    1.14 +        0,    0,   14,   14,   17,   13,    3,    9,   13,   13,
    1.15 +       13,   12,    4,    2,    8,    7,    5,    6,    1,   14,
    1.16 +       14,   15,    0,   11,    0,    0,    9,    0,   10,    0,
    1.17 +        2,    1,   14,    0
    1.18      } ;
    1.19  
    1.20  static yyconst flex_int32_t yy_ec[256] =
    1.21 @@ -809,13 +809,13 @@ yy_match:
    1.22  			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    1.23  				{
    1.24  				yy_current_state = (int) yy_def[yy_current_state];
    1.25 -				if ( yy_current_state >= 34 )
    1.26 +				if ( yy_current_state >= 35 )
    1.27  					yy_c = yy_meta[(unsigned int) yy_c];
    1.28  				}
    1.29  			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
    1.30  			++yy_cp;
    1.31  			}
    1.32 -		while ( yy_current_state != 33 );
    1.33 +		while ( yy_current_state != 34 );
    1.34  		yy_cp = yyg->yy_last_accepting_cpos;
    1.35  		yy_current_state = yyg->yy_last_accepting_state;
    1.36  
    1.37 @@ -919,34 +919,43 @@ case 12:
    1.38  YY_RULE_SETUP
    1.39  #line 67 "libxlu_cfg_l.l"
    1.40  {
    1.41 +                          ctx->likely_python= 1;
    1.42                            BEGIN(lexerr);
    1.43                            yymore();
    1.44                          }
    1.45  	YY_BREAK
    1.46  case 13:
    1.47  YY_RULE_SETUP
    1.48 -#line 72 "libxlu_cfg_l.l"
    1.49 +#line 73 "libxlu_cfg_l.l"
    1.50 +{
    1.51 +                          BEGIN(lexerr);
    1.52 +                          yymore();
    1.53 +                        }
    1.54 +	YY_BREAK
    1.55 +case 14:
    1.56 +YY_RULE_SETUP
    1.57 +#line 78 "libxlu_cfg_l.l"
    1.58  {
    1.59                            xlu__cfgl_lexicalerror(ctx,"lexical error");
    1.60                            BEGIN(0);
    1.61                          }
    1.62  	YY_BREAK
    1.63 -case 14:
    1.64 -/* rule 14 can match eol */
    1.65 +case 15:
    1.66 +/* rule 15 can match eol */
    1.67  YY_RULE_SETUP
    1.68 -#line 77 "libxlu_cfg_l.l"
    1.69 +#line 83 "libxlu_cfg_l.l"
    1.70  {
    1.71                            xlu__cfgl_lexicalerror(ctx,"lexical error");
    1.72                            BEGIN(0);
    1.73                            GOT(NEWLINE);
    1.74                          }
    1.75  	YY_BREAK
    1.76 -case 15:
    1.77 +case 16:
    1.78  YY_RULE_SETUP
    1.79 -#line 82 "libxlu_cfg_l.l"
    1.80 +#line 88 "libxlu_cfg_l.l"
    1.81  YY_FATAL_ERROR( "flex scanner jammed" );
    1.82  	YY_BREAK
    1.83 -#line 948 "libxlu_cfg_l.c"
    1.84 +#line 959 "libxlu_cfg_l.c"
    1.85  case YY_STATE_EOF(INITIAL):
    1.86  case YY_STATE_EOF(lexerr):
    1.87  	yyterminate();
    1.88 @@ -1242,7 +1251,7 @@ static int yy_get_next_buffer (yyscan_t 
    1.89  		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    1.90  			{
    1.91  			yy_current_state = (int) yy_def[yy_current_state];
    1.92 -			if ( yy_current_state >= 34 )
    1.93 +			if ( yy_current_state >= 35 )
    1.94  				yy_c = yy_meta[(unsigned int) yy_c];
    1.95  			}
    1.96  		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
    1.97 @@ -1271,11 +1280,11 @@ static int yy_get_next_buffer (yyscan_t 
    1.98  	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    1.99  		{
   1.100  		yy_current_state = (int) yy_def[yy_current_state];
   1.101 -		if ( yy_current_state >= 34 )
   1.102 +		if ( yy_current_state >= 35 )
   1.103  			yy_c = yy_meta[(unsigned int) yy_c];
   1.104  		}
   1.105  	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
   1.106 -	yy_is_jam = (yy_current_state == 33);
   1.107 +	yy_is_jam = (yy_current_state == 34);
   1.108  
   1.109  	return yy_is_jam ? 0 : yy_current_state;
   1.110  }