Fix a C++-ism in lempar.c. Ticket #1848. (CVS 3244)

FossilOrigin-Name: a0a3b34db86ef1c31d172ca1b56afd26d18e429f

diff --git a/manifest b/manifest
index e0eca719a4bd256b6fd29522d46587eb7ce29d98..943cc08f25007c77c108478f157c58d8050bc106 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sopcode\sOP_VUpdate\sand\sreplace\sthe\sxInsert/xDelete\smembers\sof\ssqlite3_module\swith\sxUpdate.\s(CVS\s3243)
-D 2006-06-14T13:03:24
+C Fix\sa\sC++-ism\sin\slempar.c.\s\sTicket\s#1848.\s(CVS\s3244)
+D 2006-06-14T15:03:50
 F Makefile.in 200f6dc376ecfd9b01e5359c4e0c10c02f649b34
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -296,7 +296,7 @@ F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/lemon.c c0ff92f7d44e108be8499d553f6fd7041487e707
-F tool/lempar.c bd4efbd36f7dab8740408479a47ae48d5ae078a7
+F tool/lempar.c 0a2a5cf96a98a64a5594625ad8fbdbe41dbaca50
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
@@ -366,7 +366,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 418f3ca84abf0d0876d2c4430f7f6ceaa9c0a17b
-R d3b17db0e8eb69099a53af1d17a74bec
-U danielk1977
-Z 6aef8b2f42c21022830f6e2cd571244b
+P 15ba5cbf07da46319897e9a2519a6dba3b142103
+R e5d404f5d3fa3bb75c6b1897b825aae7
+U drh
+Z bd69020c4dec162b4d26ae6d658151fa

diff --git a/manifest.uuid b/manifest.uuid
index e3677da81bb9a56e85d482b3f37abac73291e34e..3e2eddec3b276d7b423b7a559c27ab5920061696 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15ba5cbf07da46319897e9a2519a6dba3b142103
\ No newline at end of file
+a0a3b34db86ef1c31d172ca1b56afd26d18e429f
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index 0ede04a2252ad9751a55b20f17d7390720ba4799..a18c43a24ddd53b082ded53ee4b6687b1a73e245 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -335,31 +335,33 @@ static int yy_find_shift_action(
   i += iLookAhead;
   if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
     if( iLookAhead>0 ){
-  #ifdef YYFALLBACK
+#ifdef YYFALLBACK
       int iFallback;            /* Fallback token */
       if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
              && (iFallback = yyFallback[iLookAhead])!=0 ){
-  #ifndef NDEBUG
+#ifndef NDEBUG
         if( yyTraceFILE ){
           fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
              yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]);
         }
-  #endif
+#endif
         return yy_find_shift_action(pParser, iFallback);
       }
-  #endif
-  #ifdef YYWILDCARD
-      int j = i - iLookAhead + YYWILDCARD;
-      if( j>=0 && j<YY_SZ_ACTTAB && yy_lookahead[j]==YYWILDCARD ){
-  #ifndef NDEBUG
-        if( yyTraceFILE ){
-          fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
-             yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]);
+#endif
+#ifdef YYWILDCARD
+      {
+        int j = i - iLookAhead + YYWILDCARD;
+        if( j>=0 && j<YY_SZ_ACTTAB && yy_lookahead[j]==YYWILDCARD ){
+#ifndef NDEBUG
+          if( yyTraceFILE ){
+            fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
+               yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]);
+          }
+#endif /* NDEBUG */
+          return yy_action[j];
         }
-  #endif
-        return yy_action[j];
       }
-  #endif
+#endif /* YYWILDCARD */
     }
     return yy_default[stateno];
   }else{