diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c
index 561fbdc873..13ea600687 100644
--- a/tools/lemon/lempar.c
+++ b/tools/lemon/lempar.c
@@ -406,10 +406,9 @@ static int yy_find_shift_action(
   int stateno = pParser->yystack[pParser->yyidx].stateno;
 
   if( stateno>=YY_MIN_REDUCE ) return stateno; 
-  if( stateno>YY_SHIFT_COUNT
-   || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){
-    return yy_default[stateno];
-  }
+  assert( stateno <= YY_SHIFT_COUNT );
+  i = yy_shift_ofst[stateno];
+  if( i==YY_SHIFT_USE_DFLT ) return yy_default[stateno];
   assert( iLookAhead!=YYNOCODE );
   i += iLookAhead;
   if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){