:-) (CVS 44)

FossilOrigin-Name: cd83d3cfeb26ebf0d33e7113d0ee549c9cfd55c5

diff --git a/manifest b/manifest
index 717a9a3be367ef48a14f1415e62548d797aa7c56..d996eb7919175f3546fffb8f5369b1aafae69d29 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C :-)\s(CVS\s43)
-D 2000-06-02T23:04:52
+C :-)\s(CVS\s44)
+D 2000-06-02T23:21:27
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 3d367d6699f6fb987d0041a9d3b4dbf4308c8983
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -22,7 +22,7 @@ F src/tclsqlite.c 10c00c460246cfba375b768c90b22bfe3c774c8f
 F src/tokenize.c 15c229fee77325334c6814652e429b0930eba6c1
 F src/update.c 1f7284e00921352c3ae699fb60f2c2fbf8098212
 F src/util.c c22846f23b9311ca0e68f076686493bac7b20d5d
-F src/vdbe.c 3145ceb0905292965d76c06abecbb24ef96ae7de
+F src/vdbe.c fa1480df9b48481980d9bc06f41e839cbc67ed0e
 F src/vdbe.h ab574c91c6328c5795f68b84074fbcf860eae70e
 F src/where.c bed9a8360cbfbf712bdc397c8e22216a5e5f9800
 F test/all.test 0950c135cab7e60c07bd745ccfad1476211e5bd7
@@ -37,7 +37,7 @@ F test/table.test 85d6f410d127ec508c6640f02d7c40d218414e81
 F test/tester.tcl 44690d463c1dc83a4c76ccde07cc146a988600f6
 F test/update.test 69459302ea75cafac1479e60b0e36efb88123c0e
 F tool/gdbmdump.c 529e67c78d920606ba196326ea55b57b75fcc82b
-F tool/lemon.c f5aa4410571b598ff68aa09ee4023e8c17084c32
+F tool/lemon.c 1f0e96515c12e9e413f5b8fdebc79ddcf18ddc9d
 F tool/lempar.c a1eec94d6eacc12332368660ec65f3b248853833
 F tool/opNames.awk 2bd9071a138e4e2be13dc98fe066398a61219e1e
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -46,7 +46,7 @@ F www/c_interface.tcl 8867d76ddd416d2fbd41e4cb3de8efa9cef105a5
 F www/changes.tcl 7d6ed774362dea0c9687d4efbafd939c1c48fd81
 F www/index.tcl 0096a3e00b1364fb2c3e06941aa8c31454b6d06a
 F www/sqlite.tcl 2f933ce18cffd34a0a020a82435ab937137970fd
-P 11e3296319843356cf09832577f7dea4b33c78be
-R d2d37914332c95f0bd92b34cac0a39cd
+P 60f45a3ba56059f956cca0c3a6a1ffa82a055a36
+R 91a1b460649c65ea0a217fab34859438
 U drh
-Z 3292fd0cd8c6bb51135d1ced287b722c
+Z d6ed95be971da2c1c00f89ce64a0bce4

diff --git a/manifest.uuid b/manifest.uuid
index 9918494987504fb2f26d63d981c4c4dadccb0fc2..998e6f62ff2109ed1c08133b2c871d01c1f05f5f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60f45a3ba56059f956cca0c3a6a1ffa82a055a36
\ No newline at end of file
+cd83d3cfeb26ebf0d33e7113d0ee549c9cfd55c5
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 6fc4097f1eacd57acdaa8a99fb04497854994405..e6a6a0537e5c5ea817c3131490d8816c06a71ed7 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -41,7 +41,7 @@
 ** But other routines are also provided to help in building up
 ** a program instruction by instruction.
 **
-** $Id: vdbe.c,v 1.10 2000/06/02 15:05:33 drh Exp $
+** $Id: vdbe.c,v 1.11 2000/06/02 23:21:27 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -96,6 +96,7 @@ struct Vdbe {
   int nStackAlloc;    /* Size of the stack */
   int *iStack;        /* Integer values of the stack */
   char **zStack;      /* Text or binary values of the stack */
+  char *aFlags;       /* Flags associated with each stack entry */
   char **azColName;   /* Becomes the 4th parameter to callbacks */
   int nTable;         /* Number of slots in aTab[] */
   VdbeTable *aTab;    /* On element of this array for each open table */

diff --git a/tool/lemon.c b/tool/lemon.c
index d3552227dc89f8423abc9d634c87e55509799d23..e7168f4e98cad1b8fb2eb8989a17b88be0bad641 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -99,11 +99,11 @@ struct s_options {
   char *arg;
   char *message;
 };
-int    optinit(/* char**,struct s_options*,FILE* */);
-int    optnargs(/* void */);
-char  *optarg(/* int */);
-void   opterr(/* int */);
-void   optprint(/* void */);
+int    OptInit(/* char**,struct s_options*,FILE* */);
+int    OptNArgs(/* void */);
+char  *OptArg(/* int */);
+void   OptErr(/* int */);
+void   OptPrint(/* void */);
 
 /******** From the file "parse.h" *****************************************/
 void Parse(/* struct lemon *lemp */);
@@ -1192,7 +1192,7 @@ char **argv;
   int i;
   struct lemon lem;
 
-  optinit(argv,options,stderr);
+  OptInit(argv,options,stderr);
   if( version ){
      printf("Lemon version 1.0\n"
        "Copyright 1991-1997 by D. Richard Hipp\n"
@@ -1200,7 +1200,7 @@ char **argv;
      );
      exit(0); 
   }
-  if( optnargs()!=1 ){
+  if( OptNArgs()!=1 ){
     fprintf(stderr,"Exactly one filename argument is required.\n");
     exit(1);
   }
@@ -1211,7 +1211,7 @@ char **argv;
   Symbol_init();
   State_init();
   lem.argv0 = argv[0];
-  lem.filename = optarg(0);
+  lem.filename = OptArg(0);
   lem.basisflag = basisflag;
   lem.nconflict = 0;
   lem.name = lem.include = lem.arg = lem.tokentype = lem.start = 0;
@@ -1595,7 +1595,7 @@ FILE *err;
   return errcnt;
 }
 
-int optinit(a,o,err)
+int OptInit(a,o,err)
 char **a;
 struct s_options *o;
 FILE *err;
@@ -1616,13 +1616,13 @@ FILE *err;
   }
   if( errcnt>0 ){
     fprintf(err,"Valid command line options for \"%s\" are:\n",*a);
-    optprint();
+    OptPrint();
     exit(1);
   }
   return 0;
 }
 
-int optnargs(){
+int OptNArgs(){
   int cnt = 0;
   int dashdash = 0;
   int i;
@@ -1635,7 +1635,7 @@ int optnargs(){
   return cnt;
 }
 
-char *optarg(n)
+char *OptArg(n)
 int n;
 {
   int i;
@@ -1643,7 +1643,7 @@ int n;
   return i>=0 ? argv[i] : 0;
 }
 
-void opterr(n)
+void OptErr(n)
 int n;
 {
   int i;
@@ -1651,7 +1651,7 @@ int n;
   if( i>=0 ) errline(i,0,errstream);
 }
 
-void optprint(){
+void OptPrint(){
   int i;
   int max, len;
   max = 0;