Remove additional occurrences of <ctype.h> from FTS2.

FossilOrigin-Name: ee52589c80a6d37dc8c7a86a0e3b531ec4dd8d45

diff --git a/ext/fts2/fts2_porter.c b/ext/fts2/fts2_porter.c
index 97a95c872d318ccaa26bbee2ddbaa8696c059573..16620b93535e072863d106c39786de6c31a52e0b 100644 (file)
--- a/ext/fts2/fts2_porter.c
+++ b/ext/fts2/fts2_porter.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "fts2_tokenizer.h"
 

diff --git a/ext/fts2/fts2_tokenizer1.c b/ext/fts2/fts2_tokenizer1.c
index f2ba49e5734a33de0f1922eaf458439e4a1b0793..7e13366910d097982174bf61aa3d77a26e050a5a 100644 (file)
--- a/ext/fts2/fts2_tokenizer1.c
+++ b/ext/fts2/fts2_tokenizer1.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "fts2_tokenizer.h"
 
@@ -89,7 +88,8 @@ static int simpleCreate(
     /* Mark non-alphanumeric ASCII characters as delimiters */
     int i;
     for(i=1; i<0x80; i++){
-      t->delim[i] = !isalnum(i);
+      t->delim[i] = !((i>='0' && i<='9') || (i>='A' && i<='Z') ||
+                      (i>='a' && i<='z'));
     }
   }
 
@@ -191,7 +191,7 @@ static int simpleNext(
         ** case-insensitivity.
         */
         unsigned char ch = p[iStartOffset+i];
-        c->pToken[i] = ch<0x80 ? tolower(ch) : ch;
+        c->pToken[i] = (ch>='A' && ch<='Z') ? (ch - 'A' + 'a') : ch;
       }
       *ppToken = c->pToken;
       *pnBytes = n;

diff --git a/manifest b/manifest
index f66b4dd8169f2347e8d408c5192d43b275aa3ade..e20410ef1137a5e57e9102e0108319970795aa04 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\snew\stest\sfile\sfts3shared.test\sto\stest\sthe\sprevious\schange.
-D 2010-09-17T16:01:09
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\sadditional\soccurrences\sof\s<ctype.h>\sfrom\sFTS2.
+D 2010-09-17T17:10:31
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -53,10 +56,10 @@ F ext/fts2/fts2.h da5f76c65163301d1068a971fd32f4119e3c95fa
 F ext/fts2/fts2_hash.c 2689e42e1107ea67207f725cf69cf8972d00cf93
 F ext/fts2/fts2_hash.h 9a5b1be94664139f93217a0770d7144425cffb3a
 F ext/fts2/fts2_icu.c 1ea9993a39c9783c2e2d7446d055e9d64411dda0
-F ext/fts2/fts2_porter.c 8a6369b0fae98c04db95e4fa95fac7c03d7182ec
+F ext/fts2/fts2_porter.c 747056987951f743e955c8479f1df21a565720fe
 F ext/fts2/fts2_tokenizer.c 26e993a00b2bd5b6e73c155597361710b12ffe25
 F ext/fts2/fts2_tokenizer.h a7e46462d935a314b2682287f12f27530a3ee08e
-F ext/fts2/fts2_tokenizer1.c 8545ce12b41922004da46e91a7b023b92b76f94e
+F ext/fts2/fts2_tokenizer1.c 0123d21078e053bd98fd6186c5c6dc6d67969f2e
 F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
@@ -858,7 +861,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 018e82c775d0fb8c0d90cddf7a87c20c8c8172a9
-R 23f3d639f37034f19c46e4475c50be79
-U dan
-Z 5a6f16eca4e34587f33b9a0a6376a538
+P a207f74408acb043aafd96b8e03807d8ae5d7f01
+R ccfc236a1759bf7ba55baaa23b8f8f40
+U drh
+Z d8f63449b3dc452dffe72f003604cf9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMk6EKoxKgR168RlERAoRwAJ0SFQUu2Lw2k2NkntJqlDWofYhGZACfchJt
+Kgj0Jv3mGc/+wPqiaWJCipk=
+=jFh4
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 10c00dd31e830b6f493165ad5e4493fd9f2aaab5..d4ed61292a3877f397bfcf4e2f47e2a4fe6ea0cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a207f74408acb043aafd96b8e03807d8ae5d7f01
\ No newline at end of file
+ee52589c80a6d37dc8c7a86a0e3b531ec4dd8d45
\ No newline at end of file