From: drh <drh@noemail.net>
Date: Mon, 9 Jan 2012 14:19:05 +0000 (+0000)
Subject: Cosmetic changes to lemon.  No changes to core functionality nor impact on
X-Git-Tag: version-3.7.10~19^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cb2f6e60eb08713e5503d8976d88e64eff1e516;p=thirdparty%2Fsqlite.git

Cosmetic changes to lemon.  No changes to core functionality nor impact on
SQLite.

FossilOrigin-Name: 393fc78a18004c839d889de2a25ec046ad6f13fc
---

diff --git a/manifest b/manifest
index d926a359e3..44ecf6877d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\smultiplexor\sdoes\snot\screate\sunnecessary\soverflow\sfiles.
-D 2012-01-09T13:41:59.702
+C Cosmetic\schanges\sto\slemon.\s\sNo\schanges\sto\score\sfunctionality\snor\simpact\son\nSQLite.
+D 2012-01-09T14:19:05.358
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -949,7 +949,7 @@ F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
-F tool/lemon.c b6a92ac052f574046666d0c450806b15e579730b
+F tool/lemon.c 445f18999b700d83b83a5d9be00c596546c21052
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 12f5b8c9c9a15bd9e6aabdc708d4e869ff918e76
-R 7be4dd306837566ff2393e9f2689caa7
+P 1238619756c0c26e43d3c1c873cbdeca22ce9d61
+R 54fe0375d405cde80ba5684365164922
 U drh
-Z e058baf38f303757c1b04445e55c411b
+Z 6b9173eec4755efd3a5ae0cd88c84841
diff --git a/manifest.uuid b/manifest.uuid
index 829ed3facb..8b092c1f9c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1238619756c0c26e43d3c1c873cbdeca22ce9d61
\ No newline at end of file
+393fc78a18004c839d889de2a25ec046ad6f13fc
\ No newline at end of file
diff --git a/tool/lemon.c b/tool/lemon.c
index a089bc7ba8..c3e612b068 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -117,8 +117,6 @@ void ResortStates(struct lemon *);
 void  SetSize(int);             /* All sets will be of size N */
 char *SetNew(void);               /* A new set for element 0..N */
 void  SetFree(char*);             /* Deallocate a set */
-
-char *SetNew(void);               /* A new set for element 0..N */
 int SetAdd(char*,int);            /* Add element to a set */
 int SetUnion(char *,char *);    /* A <- A U B, thru element N */
 #define SetFind(X,Y) (X[Y])       /* True if Y is in set X */
@@ -969,7 +967,7 @@ void FindFollowSets(struct lemon *lemp)
   }while( progress );
 }
 
-static int resolve_conflict(struct action *,struct action *, struct symbol *);
+static int resolve_conflict(struct action *,struct action *);
 
 /* Compute the reduce actions, and resolve conflicts.
 */
@@ -1023,7 +1021,7 @@ void FindActions(struct lemon *lemp)
       for(nap=ap->next; nap && nap->sp==ap->sp; nap=nap->next){
          /* The two actions "ap" and "nap" have the same lookahead.
          ** Figure out which one should be used */
-         lemp->nconflict += resolve_conflict(ap,nap,lemp->errsym);
+         lemp->nconflict += resolve_conflict(ap,nap);
       }
     }
   }
@@ -1058,8 +1056,7 @@ void FindActions(struct lemon *lemp)
 */
 static int resolve_conflict(
   struct action *apx,
-  struct action *apy,
-  struct symbol *errsym   /* The error symbol (if defined.  NULL otherwise) */
+  struct action *apy
 ){
   struct symbol *spx, *spy;
   int errcnt = 0;
@@ -1996,7 +1993,7 @@ static void parseonetoken(struct pstate *psp)
       }else if( x[0]=='{' ){
         if( psp->prevrule==0 ){
           ErrorMsg(psp->filename,psp->tokenlineno,
-"There is no prior rule opon which to attach the code \
+"There is no prior rule upon which to attach the code \
 fragment which begins on this line.");
           psp->errorcnt++;
 	}else if( psp->prevrule->code!=0 ){