More performance tweaking in the parser. (CVS 2302)

FossilOrigin-Name: a3d12726bb7bce72b8266236800c07f22ac5212f

diff --git a/manifest b/manifest
index 3866497cf57ef5c13f38b942ded48d54eeceb4a7..565243ff0d164e7858f347480b799969d99d8876 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\serror\sintroduced\swith\s(2299).\s(CVS\s2301)
-D 2005-02-01T03:46:44
+C More\sperformance\stweaking\sin\sthe\sparser.\s(CVS\s2302)
+D 2005-02-01T04:09:37
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -212,7 +212,7 @@ F test/view.test 306cc4342eb03c28de1a92c681836189e03e5af9
 F test/where.test ffb790dfda75d977bae7a1f5830351623f76861b
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/lemon.c 4a3b5ccc76d959b8caa5f127d23a7e14d4470b4e
-F tool/lempar.c 38b1f1fcb8ae384b71a57982940307a7e844e2f1
+F tool/lempar.c 9bf2f402ab464d3ffb67e7de6154eb66f99d115c
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl b8eb053190e95a55dc188896afb972e8108822d6
@@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P adcd9a3fa2a86464abd613aa88ae110b4799a241
-R 4390b441d9dc8a1b90dd748f69f20841
-U danielk1977
-Z 82c01dc0abcdca97a122e56366b36569
+P 22041d5f26355b0fc80eb355bfec897fb50ac1e1
+R b4a54ea3cafcdb288b43686dac552263
+U drh
+Z 237a2ff17f8375528094b2d5b90c3f47

diff --git a/manifest.uuid b/manifest.uuid
index bc9b6f5c044454b9e5c2aa5561211403f2ed3367..28273391841cf30988a4bc3d27bce06a6645af5e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22041d5f26355b0fc80eb355bfec897fb50ac1e1
\ No newline at end of file
+a3d12726bb7bce72b8266236800c07f22ac5212f
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index 41d1b5f845455b23c8351965beb23ec72417a76b..f7e2471f052f1be30f4ab36afcaea856e4bfcfaf 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -364,11 +364,11 @@ static int yy_find_shift_action(
 ** return YY_NO_ACTION.
 */
 static int yy_find_reduce_action(
-  yyParser *pParser,        /* The parser */
+  int stateno,              /* Current state number */
   int iLookAhead            /* The look-ahead token */
 ){
   int i;
-  int stateno = pParser->yystack[pParser->yyidx].stateno;
+  /* int stateno = pParser->yystack[pParser->yyidx].stateno; */
  
   i = yy_reduce_ofst[stateno];
   if( i==YY_REDUCE_USE_DFLT ){
@@ -476,7 +476,7 @@ static void yy_reduce(
   yygoto = yyRuleInfo[yyruleno].lhs;
   yysize = yyRuleInfo[yyruleno].nrhs;
   yypParser->yyidx -= yysize;
-  yyact = yy_find_reduce_action(yypParser,yygoto);
+  yyact = yy_find_reduce_action(yymsp[-yysize].stateno,yygoto);
   if( yyact < YYNSTATE ){
 #ifdef NDEBUG
     /* If we are not debugging and the reduce action popped at least