Fix the FTS3 module with parenthesis syntax so that it will work in

the amalgamation. (CVS 6087)

FossilOrigin-Name: c2b9891fc05ec05b270f108f61ab81b2df874e01

diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c
index e0561ca4b6b09746eb20466c0313193262fb9e14..32e6425d728e1a5224d2321bd03997d9e8e9d153 100644 (file)
--- a/ext/fts3/fts3_expr.c
+++ b/ext/fts3/fts3_expr.c
@@ -82,7 +82,7 @@ struct ParseContext {
 ** any values that fall outside of the range of the unsigned char type (i.e.
 ** negative values).
 */
-static int safe_isspace(char c){
+static int safe_isspace_expr(char c){
   return (c&0x80)==0 ? isspace(c) : 0;
 }
 
@@ -302,7 +302,7 @@ static int getNextNode(
   /* Skip over any whitespace before checking for a keyword, an open or
   ** close bracket, or a quoted string. 
   */
-  while( nInput>0 && safe_isspace(*zInput) ){
+  while( nInput>0 && safe_isspace_expr(*zInput) ){
     nInput--;
     zInput++;
   }
@@ -338,7 +338,7 @@ static int getNextNode(
       ** bracket, a quote character, or EOF. 
       */
       cNext = zInput[nKey];
-      if( safe_isspace(cNext) 
+      if( safe_isspace_expr(cNext) 
        || cNext=='"' || cNext=='(' || cNext==')' || cNext==0
       ){
         pRet = (Fts3Expr *)sqlite3_malloc(sizeof(Fts3Expr));

diff --git a/manifest b/manifest
index 173cec6e48c7af1aa8c334ae0dac3880b3edf844..72a0204f297087aa8b45981db7b68d583ea07d1a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\smulti-index\sOR\scost\sestimator.\s\sRemove\sleftover\s"breakpoint"\ncommands\sfrom\stest\sscripts.\s(CVS\s6086)
-D 2008-12-30T17:55:00
+C Fix\sthe\sFTS3\smodule\swith\sparenthesis\ssyntax\sso\sthat\sit\swill\swork\sin\nthe\samalgamation.\s(CVS\s6087)
+D 2008-12-31T16:01:05
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77635d0909c2067cee03889a1e04ce910d8fb809
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -55,7 +55,7 @@ F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts3/fts3.c 3aa6aef1eadc44606f6ed3c841062735a5210077
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3_expr.c a20038d4ebbfbadc1947d33e21f4d58f20637253
+F ext/fts3/fts3_expr.c e703bbd6320be30aa65a0aa8d73ecd96e2f2c5ab
 F ext/fts3/fts3_expr.h 4dad4d87cf5d41ea924a815fe89a6f87dc76f277
 F ext/fts3/fts3_hash.c e15e84d18f8df149ab290029872d4559c4c7c15a
 F ext/fts3/fts3_hash.h 004b759e1602ff16dfa02fea3ca1c77336ad6798
@@ -674,7 +674,7 @@ F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c 698ea044ca0b49bde8a9f3ce6429e8dc5a259d25
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl c259bcf64ae8fce346e3ae302c3fd6db977f89a8
+F tool/mksqlite3c.tcl bc7c626adfca5aa022454a411a62e81e7204339e
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -689,7 +689,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 96f3b62914adde34079f08428b4e2fe81c193612
-R a587871f2078cbde0dc075e778eb076c
+P b090d5736d7eaec17a39d3133e1587b1d2a42acb
+R 4a221e4be139a10aa8342aaa4a5979da
 U drh
-Z 599df2fe0ed8072247fd99ebe901d866
+Z 06bc00def2a1cea32d664ed02699a783

diff --git a/manifest.uuid b/manifest.uuid
index e89646a65a98201bf8e428b4a6e9cc6276232bc0..7568cc4ade0422ccb9dce1d7489b193c2832e84c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b090d5736d7eaec17a39d3133e1587b1d2a42acb
\ No newline at end of file
+c2b9891fc05ec05b270f108f61ab81b2df874e01
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 50c53cb883232aef70a8aeb7d302287bd6222a08..21cb3f874f06712c4730d7ea5fabeeaf48414e69 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -89,6 +89,7 @@ foreach hdr {
    btree.h
    btreeInt.h
    fts3.h
+   fts3_expr.h
    fts3_hash.h
    fts3_tokenizer.h
    hash.h
@@ -285,6 +286,7 @@ foreach file {
    main.c
 
    fts3.c
+   fts3_expr.c
    fts3_hash.c
    fts3_porter.c
    fts3_tokenizer.c