| Index: third_party/sqlite/src/src/lempar.c
|
| diff --git a/third_party/sqlite/src/src/lempar.c b/third_party/sqlite/src/src/lempar.c
|
| index 8439bd71c7cd7703b11caf9ce8d24d1227f4a14b..fb52490e4c14cb74b6ccfadbd44f46c70893760e 100644
|
| --- a/third_party/sqlite/src/src/lempar.c
|
| +++ b/third_party/sqlite/src/src/lempar.c
|
| @@ -131,7 +131,6 @@ static const YYMINORTYPE yyzerominor = { 0 };
|
| ** yy_default[] Default action for each state.
|
| */
|
| %%
|
| -#define YY_SZ_ACTTAB (int)(sizeof(yy_action)/sizeof(yy_action[0]))
|
|
|
| /* The next table maps tokens into fallback tokens. If a construct
|
| ** like the following:
|
| @@ -396,14 +395,13 @@ static int yy_find_shift_action(
|
| int i;
|
| int stateno = pParser->yystack[pParser->yyidx].stateno;
|
|
|
| - if( stateno>YY_SHIFT_MAX || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){
|
| + if( stateno>YY_SHIFT_COUNT
|
| + || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){
|
| return yy_default[stateno];
|
| }
|
| assert( iLookAhead!=YYNOCODE );
|
| i += iLookAhead;
|
| - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
| - /* The user of ";" instead of "\000" as a statement terminator in SQLite
|
| - ** means that we always have a look-ahead token. */
|
| + if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
|
| if( iLookAhead>0 ){
|
| #ifdef YYFALLBACK
|
| YYCODETYPE iFallback; /* Fallback token */
|
| @@ -421,7 +419,15 @@ static int yy_find_shift_action(
|
| #ifdef YYWILDCARD
|
| {
|
| int j = i - iLookAhead + YYWILDCARD;
|
| - if( j>=0 && j<YY_SZ_ACTTAB && yy_lookahead[j]==YYWILDCARD ){
|
| + if(
|
| +#if YY_SHIFT_MIN+YYWILDCARD<0
|
| + j>=0 &&
|
| +#endif
|
| +#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
|
| + j<YY_ACTTAB_COUNT &&
|
| +#endif
|
| + yy_lookahead[j]==YYWILDCARD
|
| + ){
|
| #ifndef NDEBUG
|
| if( yyTraceFILE ){
|
| fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
|
| @@ -453,22 +459,22 @@ static int yy_find_reduce_action(
|
| ){
|
| int i;
|
| #ifdef YYERRORSYMBOL
|
| - if( stateno>YY_REDUCE_MAX ){
|
| + if( stateno>YY_REDUCE_COUNT ){
|
| return yy_default[stateno];
|
| }
|
| #else
|
| - assert( stateno<=YY_REDUCE_MAX );
|
| + assert( stateno<=YY_REDUCE_COUNT );
|
| #endif
|
| i = yy_reduce_ofst[stateno];
|
| assert( i!=YY_REDUCE_USE_DFLT );
|
| assert( iLookAhead!=YYNOCODE );
|
| i += iLookAhead;
|
| #ifdef YYERRORSYMBOL
|
| - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
| + if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
|
| return yy_default[stateno];
|
| }
|
| #else
|
| - assert( i>=0 && i<YY_SZ_ACTTAB );
|
| + assert( i>=0 && i<YY_ACTTAB_COUNT );
|
| assert( yy_lookahead[i]==iLookAhead );
|
| #endif
|
| return yy_action[i];
|
|
|