From: drh Date: Wed, 7 May 2003 13:37:31 +0000 (+0000) Subject: Format keyword lists in lang.html using a TCL proc. (CVS 961) X-Git-Tag: version-3.6.10~5107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f94e371bbf6251418730527e0a9c9e9d0e0edc96;p=thirdparty%2Fsqlite.git Format keyword lists in lang.html using a TCL proc. (CVS 961) FossilOrigin-Name: ca75f1ca12cd88dce688e272d73c3c2282079547 --- diff --git a/manifest b/manifest index 53b04914fa..3c74c73950 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C -\sAdded\sentries\sfor\sPRAGMAs\sdatabase_list,\stemp_store\sand\sdefault_temp_store.\n-\sFixed\smissing\send\stags.\s(CVS\s960) -D 2003-05-07T04:04:17 +C Format\skeyword\slists\sin\slang.html\susing\sa\sTCL\sproc.\s(CVS\s961) +D 2003-05-07T13:37:31 F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -155,7 +155,7 @@ F www/faq.tcl 12d1788d4abcfe1ff3054e17605df2418883bf6f F www/fileformat.tcl d9b586416c0d099b82e02e469d532c9372f98f3f F www/formatchng.tcl cbaf0f410096c71f86a7537cf9249fa04b9a659c F www/index.tcl b155eba45136d19e7aa6ba979d4093180c335cf7 -F www/lang.tcl bbd268bb1251c94062896d5bdb4beca19bc0ea1f +F www/lang.tcl 4cec7ec64b805f42a43603f13ebeabeca24cfa3b F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c F www/nulls.tcl 29497dac2bc5b437aa7e2e94577dad4d8933ed26 F www/omitted.tcl 118062f40a203fcb88b8d68ef1d7c0073ac191ec @@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be F www/sqlite.tcl ffde644361e1d8e2a44a235ff23ad3b43d640df2 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P bb609f96e00fd62d932601c4aa37bc17baa82257 -R dda10c19cfdf488f535f7dc535754b7d -U jplyon -Z c9d5bf00e4e436e976c07b135d71d6fc +P 55ae7b35ee2dcebc99256d4b1e22a87ea75e3d03 +R 849b94043a42ea202d2d3a2e258a557f +U drh +Z e811bb2e7df7f5cfb03940a1ebd0bc01 diff --git a/manifest.uuid b/manifest.uuid index 4ce2b723c3..ef1e219399 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -55ae7b35ee2dcebc99256d4b1e22a87ea75e3d03 \ No newline at end of file +ca75f1ca12cd88dce688e272d73c3c2282079547 \ No newline at end of file diff --git a/www/lang.tcl b/www/lang.tcl index 8983630d8b..6a218df492 100644 --- a/www/lang.tcl +++ b/www/lang.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the sqlite.html file. # -set rcsid {$Id: lang.tcl,v 1.55 2003/05/07 04:04:17 jplyon Exp $} +set rcsid {$Id: lang.tcl,v 1.56 2003/05/07 13:37:31 drh Exp $} puts { @@ -1591,39 +1591,156 @@ case-insensitive.

These keywords can be used as identifiers for SQLite objects without delimiters.

+} + +proc keyword_list {x} { + puts "

" + foreach k $x { + if {[string index $k 0]=="*"} { + set nonstandard 1 + set k [string range $k 1 end] + } else { + set nonstandard 0 + } + if {$nonstandard} { + puts "$k   " + } else { + puts "$k   " + } + } + puts "

\n" +} -

ABORT AFTER ASC ATTACH BEFORE BEGIN DEFERRED CASCADE -CLUSTER CONFLICT COPY CROSS DATABASE -DELIMITERS DESC DETACH EACH END EXPLAIN FAIL -FOR FULL IGNORE IMMEDIATE INITIALLY INNER INSTEAD KEY LEFT MATCH -NATURAL OF OFFSET OUTER PRAGMA RAISE REPLACE -RESTRICT RIGHT ROW STATEMENT TEMP TEMPORARY TRIGGER -VACUUM VIEW

+keyword_list { + *ABORT + AFTER + ASC + *ATTACH + BEFORE + BEGIN + DEFERRED + CASCADE + *CLUSTER + *CONFLICT + *COPY + CROSS + *DATABASE + *DELIMITERS + DESC + *DETACH + EACH + END + *EXPLAIN + *FAIL + FOR + FULL + IGNORE + IMMEDIATE + INITIALLY + INNER + *INSTEAD + KEY + LEFT + MATCH + NATURAL + OF + *OFFSET + OUTER + *PRAGMA + *RAISE + *REPLACE + RESTRICT + RIGHT + *ROW + *STATEMENT + *TEMP + TEMPORARY + TRIGGER + *VACUUM + VIEW +} +puts {

Normal keywords

These keywords can be used as identifiers for SQLite objects, but must be enclosed in brackets or quotes for SQLite to recognize them as an identifier.

+} -

ALL AND AS BETWEEN BY CASE CHECK COLLATE COMMIT CONSTRAINT CREATE -DEFAULT DEFERRABLE DELETE DISTINCT DROP ELSE EXCEPT FOREIGN FROM -GLOB GROUP HAVING IN INDEX INSERT INTERSECT INTO IS -ISNULL JOIN LIKE LIMIT NOT NOTNULL NULL ON OR ORDER -PRIMARY REFERENCES ROLLBACK SELECT SET TABLE THEN TRANSACTION UNION -UNIQUE UPDATE USING VALUES WHEN WHERE

+keyword_list { + ALL + AND + AS + BETWEEN + BY + CASE + CHECK + COLLATE + COMMIT + CONSTRAINT + CREATE + DEFAULT + DEFERRABLE + DELETE + DISTINCT + DROP + ELSE + EXCEPT + FOREIGN + FROM + *GLOB + GROUP + HAVING + IN + *INDEX + INSERT + INTERSECT + INTO + IS + *ISNULL + JOIN + LIKE + LIMIT + NOT + *NOTNULL + NULL + ON + OR + ORDER + PRIMARY + REFERENCES + ROLLBACK + SELECT + SET + TABLE + THEN + TRANSACTION + UNION + UNIQUE + UPDATE + USING + VALUES + WHEN + WHERE +} +puts {

Special words

The following are not keywords in SQLite, but are used as names of system objects. They can be used as an identifier for a different type of object.

- -

_ROWID_ MAIN OID ROWID SQLITE_MASTER -SQLITE_TEMP_MASTER -

} +keyword_list { + *_ROWID_ + *MAIN + OID + *ROWID + *SQLITE_MASTER + *SQLITE_TEMP_MASTER +} puts {