Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch th1-query-api Through [e923b4a64d] Excluding Merge-Ins
This is equivalent to a diff from 31545360ab to e923b4a64d
|
2012-07-14
| ||
| 16:51 | Merge the root-tag branch into trunk. ... (check-in: 9f83e033a2 user: drh tags: trunk) | |
| 13:51 | moved th1 argv funcs into their own registration unit. Renamed argv_getat to argv_at. ... (check-in: 3b25f80edd user: stephan tags: th1-query-api) | |
| 13:43 | Refactored th1 function registration code to be reusable across modules. ... (check-in: e923b4a64d user: stephan tags: th1-query-api) | |
| 13:20 | minor generic cleanups in th1 before continuing on to real work... ... (check-in: 1767603f23 user: stephan tags: th1-query-api) | |
| 04:43 | Allow check-in specifications of the form "root:BRANCH" where BRANCH is a branch name. Such a spec refers to the point on the parent branch from which the branch is derived. Useful for doing a diff of an entire branch, for example, using "fossil diff --from root:xyz --to xyz". ... (check-in: a4e01221c8 user: drh tags: root-tag) | |
| 00:20 | added th1 query API. ... (check-in: c3b10e12a1 user: stephan tags: th1-query-api) | |
|
2012-07-13
| ||
| 20:52 | minor formatting fix. ... (check-in: 31545360ab user: stephan tags: trunk) | |
| 18:55 | minor doc correction. ... (check-in: 5df13a0b38 user: stephan tags: trunk) | |
Changes to src/db.c.
| ︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 |
**
** Check for unfinalized statements and report errors if the reportErrors
** argument is true. Ignore unfinalized statements when false.
*/
void db_close(int reportErrors){
sqlite3_stmt *pStmt;
if( g.db==0 ) return;
if( g.fSqlStats ){
int cur, hiwtr;
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_USED, &cur, &hiwtr, 0);
fprintf(stderr, "-- LOOKASIDE_USED %10d %10d\n", cur, hiwtr);
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_HIT, &cur, &hiwtr, 0);
fprintf(stderr, "-- LOOKASIDE_HIT %10d\n", hiwtr);
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE, &cur,&hiwtr,0);
| > > > > > > | 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 |
**
** Check for unfinalized statements and report errors if the reportErrors
** argument is true. Ignore unfinalized statements when false.
*/
void db_close(int reportErrors){
sqlite3_stmt *pStmt;
if( g.db==0 ) return;
if(g.interp){
/* clean up up any query_prepare statements */
Th_DeleteInterp(g.interp);
g.interp = 0;
}
if( g.fSqlStats ){
int cur, hiwtr;
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_USED, &cur, &hiwtr, 0);
fprintf(stderr, "-- LOOKASIDE_USED %10d %10d\n", cur, hiwtr);
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_HIT, &cur, &hiwtr, 0);
fprintf(stderr, "-- LOOKASIDE_HIT %10d\n", hiwtr);
sqlite3_db_status(g.db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE, &cur,&hiwtr,0);
|
| ︙ | ︙ |
Changes to src/main.c.
| ︙ | ︙ | |||
785 786 787 788 789 790 791 | /* ** Look for a command-line option. If present, return a pointer. ** Return NULL if missing. ** ** hasArg==0 means the option is a flag. It is either present or not. | | > > > > | > > > > > > > > > > > > > > > > | > < > > | > > > | > > > > > > > | > > > | | | | > > | 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 |
/*
** Look for a command-line option. If present, return a pointer.
** Return NULL if missing.
**
** hasArg==0 means the option is a flag. It is either present or not.
** hasArg==1 means the option has an argument. Return a pointer to
** the argument. If hasArg is 0 and the argument is found then a
** pointer to an empty string is returned (to distinguish from
** NULL). If hasArg==1 and the option lies at the end of the argument
** list, it is treated as if it had not been found.
**
** Note that this function REMOVES any found entry from the args list,
** so calling this twice for the same var will cause NULL to be
** returned after the first time.
**
** zLong may not be NULL but zShort may be.
**
** Options are accepted in these forms, depending on the value of
** hasArg:
**
** hasArg=true:
** -long (hasArg==0)
** -long VALUE (hasArg==1)
** -long=VALUE (hasArg==1)
** -short (hasArg==0)
** -short VALUE (hasArg==1)
** -short=VALUE (hasArg==1)
*/
const char *find_option(const char *zLong, const char *zShort, int hasArg){
int i;
int nLong, nShort;
const char *zReturn = 0;
assert( hasArg==0 || hasArg==1 );
nLong = strlen(zLong);
nShort = zShort ? strlen(zShort) : 0;
for(i=1; i<g.argc; i++){
char *z;
z = g.argv[i];
if( z[0]!='-' ) continue;
z++;
if( z[0]=='-' ){
if( z[1]==0 ){
remove_from_argv(i, 1);
break;
}
z++;
}
if( strncmp(z,zLong,nLong)==0 ){
if( hasArg && z[nLong]=='=' ){
zReturn = &z[nLong+1];
remove_from_argv(i, 1);
break;
}else if( z[nLong]==0 ){
if( hasArg ){
if (i+hasArg >= g.argc) break;
zReturn = g.argv[i+hasArg];
}else{
zReturn = "";
}
remove_from_argv(i, 1+hasArg);
break;
}
}else if( strncmp(z,zShort,nShort)==0 ){
if( hasArg && z[nShort]=='=' ){
zReturn = &z[nShort+1];
remove_from_argv(i, 1);
break;
}else if( z[nShort]==0 ){
if( hasArg ){
if (i+hasArg >= g.argc) break;
zReturn = g.argv[i+hasArg];
}else{
zReturn = "";
}
remove_from_argv(i, 1+hasArg);
break;
}
}
}
return zReturn;
}
/*
** Verify that there are no unprocessed command-line options. If
** Any remaining command-line argument begins with "-" print
** an error message and quit.
|
| ︙ | ︙ |
Changes to src/th.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
/*
** The implementation of the TH core. This file contains the parser, and
** the implementation of the interface in th.h.
*/
#include "th.h"
#include <string.h>
#include <assert.h>
typedef struct Th_Command Th_Command;
typedef struct Th_Frame Th_Frame;
typedef struct Th_Variable Th_Variable;
/*
** Interpreter structure.
*/
struct Th_Interp {
Th_Vtab *pVtab; /* Copy of the argument passed to Th_CreateInterp() */
char *zResult; /* Current interpreter result (Th_Malloc()ed) */
int nResult; /* number of bytes in zResult */
Th_Hash *paCmd; /* Table of registered commands */
Th_Frame *pFrame; /* Current execution frame */
int isListMode; /* True if thSplitList() should operate in "list" mode */
};
/*
** Each TH command registered using Th_CreateCommand() is represented
** by an instance of the following structure stored in the Th_Interp.paCmd
** hash-table.
*/
| > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
/*
** The implementation of the TH core. This file contains the parser, and
** the implementation of the interface in th.h.
*/
#include "th.h"
#include <string.h>
#include <assert.h>
#include <stdio.h> /* FILE class */
typedef struct Th_Command Th_Command;
typedef struct Th_Frame Th_Frame;
typedef struct Th_Variable Th_Variable;
/*
** Interpreter structure.
*/
struct Th_Interp {
Th_Vtab *pVtab; /* Copy of the argument passed to Th_CreateInterp() */
char *zResult; /* Current interpreter result (Th_Malloc()ed) */
int nResult; /* number of bytes in zResult */
Th_Hash *paCmd; /* Table of registered commands */
Th_Frame *pFrame; /* Current execution frame */
int isListMode; /* True if thSplitList() should operate in "list" mode */
#ifdef TH_USE_SQLITE
struct {
sqlite3_stmt ** aStmt;
int nStmt;
int rc;
} stmt;
#endif
};
/*
** Each TH command registered using Th_CreateCommand() is represented
** by an instance of the following structure stored in the Th_Interp.paCmd
** hash-table.
*/
|
| ︙ | ︙ | |||
1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 |
}
void Th_Free(Th_Interp *pInterp, void *z){
if( z ){
pInterp->pVtab->xFree(z);
}
}
/*
** Install a new th1 command.
**
** If a command of the same name already exists, it is deleted automatically.
*/
int Th_CreateCommand(
Th_Interp *interp,
| > > > > > > > > > > > > > > > > > > > > > > > | 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 |
}
void Th_Free(Th_Interp *pInterp, void *z){
if( z ){
pInterp->pVtab->xFree(z);
}
}
int Th_Vtab_output( Th_Vtab *vTab, char const * zData, int nData ){
if(!vTab->out.f){
return -1;
}else if(!vTab->out.enabled){
return 0;
}else{
return vTab->out.f( zData, nData, vTab->out.pState );
}
}
int Th_output( Th_Interp *pInterp, char const * zData, int nData ){
return Th_Vtab_output( pInterp->pVtab, zData, nData );
}
int Th_output_f_FILE( char const * zData, int nData, void * pState ){
FILE * dest = pState ? (FILE*)pState : stdout;
int rc = (int)fwrite(zData, 1, nData, dest);
fflush(dest);
return rc;
}
/*
** Install a new th1 command.
**
** If a command of the same name already exists, it is deleted automatically.
*/
int Th_CreateCommand(
Th_Interp *interp,
|
| ︙ | ︙ | |||
1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 | /* Delete any result currently stored in the interpreter. */ Th_SetResult(interp, 0, 0); /* Delete all registered commands and the command hash-table itself. */ Th_HashIterate(interp, interp->paCmd, thFreeCommand, (void *)interp); Th_HashDelete(interp, interp->paCmd); /* Delete the interpreter structure itself. */ Th_Free(interp, (void *)interp); } /* ** Create a new interpreter. */ | > > > > > > > > > > > > > > > > > | 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 |
/* Delete any result currently stored in the interpreter. */
Th_SetResult(interp, 0, 0);
/* Delete all registered commands and the command hash-table itself. */
Th_HashIterate(interp, interp->paCmd, thFreeCommand, (void *)interp);
Th_HashDelete(interp, interp->paCmd);
#ifdef TH_USE_SQLITE
{
int i;
sqlite3_stmt * st;
for( i = 0; i < interp->stmt.nStmt; ++i ){
st = interp->stmt.aStmt[i];
if(NULL != st){
fossil_warning("Auto-finalizing unfinalized query_prepare "
"statement id #%d: %s",
i+1, sqlite3_sql(st));
Th_FinalizeStmt( interp, i+1 );
}
}
Th_Free(interp, interp->stmt.aStmt);
}
#endif
/* Delete the interpreter structure itself. */
Th_Free(interp, (void *)interp);
}
/*
** Create a new interpreter.
*/
|
| ︙ | ︙ | |||
2603 2604 2605 2606 2607 2608 2609 |
*z++ = zExp[i];
}
}
*z = '\0';
return Th_SetResult(interp, zBuf, -1);
}
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 |
*z++ = zExp[i];
}
}
*z = '\0';
return Th_SetResult(interp, zBuf, -1);
}
#ifdef TH_USE_SQLITE
extern void *fossil_realloc(void *p, size_t n);
int Th_AddStmt(Th_Interp *interp, sqlite3_stmt * pStmt){
int i, x;
sqlite3_stmt * s;
sqlite3_stmt ** list = interp->stmt.aStmt;
for( i = 0; i < interp->stmt.nStmt; ++i ){
s = list[i];
if(NULL==s){
list[i] = pStmt;
return i+1;
}
}
x = (interp->stmt.nStmt + 1) * 2;
list = (sqlite3_stmt**)fossil_realloc( list, sizeof(sqlite3_stmt*)*x );
for( i = interp->stmt.nStmt; i < x; ++i ){
list[i] = NULL;
}
list[interp->stmt.nStmt] = pStmt;
x = interp->stmt.nStmt;
interp->stmt.nStmt = i;
interp->stmt.aStmt = list;
return x + 1;
}
int Th_FinalizeStmt(Th_Interp *interp, int stmtId){
sqlite3_stmt * st;
int rc = 0;
assert( stmtId>0 && stmtId<=interp->stmt.nStmt );
st = interp->stmt.aStmt[stmtId-1];
if(NULL != st){
interp->stmt.aStmt[stmtId-1] = NULL;
sqlite3_finalize(st);
return 0;
}else{
return 1;
}
}
sqlite3_stmt * Th_GetStmt(Th_Interp *interp, int stmtId){
return ((stmtId<1) || (stmtId > interp->stmt.nStmt))
? NULL
: interp->stmt.aStmt[stmtId-1];
}
#endif
/* end TH_USE_SQLITE */
|
Changes to src/th.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
/* This header file defines the external interface to the custom Scripting
** Language (TH) interpreter. TH is very similar to TCL but is not an
** exact clone.
*/
/*
** Before creating an interpreter, the application must allocate and
** populate an instance of the following structure. It must remain valid
** for the lifetime of the interpreter.
*/
struct Th_Vtab {
void *(*xMalloc)(unsigned int);
void (*xFree)(void *);
};
typedef struct Th_Vtab Th_Vtab;
/*
** Opaque handle for interpeter.
*/
typedef struct Th_Interp Th_Interp;
/*
** Create and delete interpreters.
*/
Th_Interp * Th_CreateInterp(Th_Vtab *pVtab);
void Th_DeleteInterp(Th_Interp *);
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
#ifdef TH_USE_SQLITE
#if 0==TH_USE_SQLITE
#undef TH_USE_SQLITE
#endif
#endif
#define TH_USE_SQLITE
#ifdef TH_USE_SQLITE
#include "sqlite3.h"
#endif
/* This header file defines the external interface to the custom Scripting
** Language (TH) interpreter. TH is very similar to TCL but is not an
** exact clone.
*/
/*
** Th_output_f() specifies a generic output routine for use by Th_Vtab
** and friends. Its first argument is the data to write, the second is
** the number of bytes to write, and the 3rd is an
** implementation-specific state pointer (may be NULL, depending on
** the implementation). The return value is the number of bytes output
** (which may differ from len due to encoding and whatnot). On error
** a negative value must be returned.
*/
typedef int (*Th_output_f)( char const * zData, int len, void * pState );
struct Th_Vtab_Output {
Th_output_f f; /* output handler */
void * pState; /* final argument for xOut() */
char enabled; /* if 0, Th_output() does nothing. */
};
typedef struct Th_Vtab_Output Th_Vtab_Output;
/*
** Before creating an interpreter, the application must allocate and
** populate an instance of the following structure. It must remain valid
** for the lifetime of the interpreter.
*/
struct Th_Vtab {
void *(*xMalloc)(unsigned int);
void (*xFree)(void *);
Th_Vtab_Output out;
};
typedef struct Th_Vtab Th_Vtab;
/*
** Opaque handle for interpeter.
*/
typedef struct Th_Interp Th_Interp;
/*
** Create and delete interpreters.
*/
Th_Interp * Th_CreateInterp(Th_Vtab *pVtab);
void Th_DeleteInterp(Th_Interp *);
|
| ︙ | ︙ | |||
149 150 151 152 153 154 155 | int th_isspecial(char); char *th_strdup(Th_Interp *interp, const char *z, int n); /* ** Interfaces to register the language extensions. */ int th_register_language(Th_Interp *interp); /* th_lang.c */ | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | int th_isspecial(char); char *th_strdup(Th_Interp *interp, const char *z, int n); /* ** Interfaces to register the language extensions. */ int th_register_language(Th_Interp *interp); /* th_lang.c */ int th_register_sqlite(Th_Interp *interp); /* th_main.c */ int th_register_vfs(Th_Interp *interp); /* th_vfs.c */ int th_register_testvfs(Th_Interp *interp); /* th_testvfs.c */ int th_register_tcl(Th_Interp *interp, void *pContext); /* th_tcl.c */ /* ** General purpose hash table from th_lang.c. */ |
| ︙ | ︙ | |||
174 175 176 177 178 179 180 181 182 183 |
void Th_HashIterate(Th_Interp*,Th_Hash*,void (*x)(Th_HashEntry*, void*),void*);
Th_HashEntry *Th_HashFind(Th_Interp*, Th_Hash*, const char*, int, int);
/*
** Useful functions from th_lang.c.
*/
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg);
typedef struct Th_SubCommand {char *zName; Th_CommandProc xProc;} Th_SubCommand;
int Th_CallSubCommand(Th_Interp*,void*,int,const char**,int*,Th_SubCommand*);
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
void Th_HashIterate(Th_Interp*,Th_Hash*,void (*x)(Th_HashEntry*, void*),void*);
Th_HashEntry *Th_HashFind(Th_Interp*, Th_Hash*, const char*, int, int);
/*
** Useful functions from th_lang.c.
*/
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg);
/*
** Works like Th_WrongNumArgs() but expects (zCmdName,zCmdLen) to be
** the current command's (name,length), i.e. (argv[0],argl[0]).
*/
int Th_WrongNumArgs2(Th_Interp *interp, const char *zCmdName,
int zCmdLen, const char *zMsg);
typedef struct Th_SubCommand {char *zName; Th_CommandProc xProc;} Th_SubCommand;
int Th_CallSubCommand(Th_Interp*,void*,int,const char**,int*,Th_SubCommand*);
/*
** Sends the given data through vTab->out.f() if vTab->out.enabled is
** true, otherwise this is a no-op. Returns 0 or higher on success, *
** a negative value if vTab->out.f is NULL.
*/
int Th_Vtab_output( Th_Vtab *vTab, char const * zData, int len );
/*
** Sends the given output through pInterp's v-table's output
** implementation. See Th_Vtab_output() for the argument and
** return value semantics.
*/
int Th_output( Th_Interp *pInterp, char const * zData, int len );
/*
** Th_output_f() implementation which sends its output to either
** pState (which must be NULL or a (FILE*)) or stdout (if pState is
** NULL).
*/
int Th_output_f_FILE( char const * zData, int len, void * pState );
typedef struct Th_Command_Reg Th_Command_Reg;
/*
** A helper type for holding lists of function registration information.
** For use with Th_register_commands().
*/
struct Th_Command_Reg {
const char *zName; /* Function name. */
Th_CommandProc xProc; /* Callback function */
void *pContext; /* Arbitrary data for the callback. */
};
/*
** Registers a list of commands with the interpreter. pList must be a non-NULL
** pointer to an array of Th_Command_Reg objects, the last one of which MUST
** have a NULL zName field (that is the end-of-list marker).
** Returns TH_OK on success, "something else" on error.
*/
int Th_register_commands( Th_Interp * interp, Th_Command_Reg const * pList );
#ifdef TH_USE_SQLITE
#include "stddef.h" /* size_t */
extern void *fossil_realloc(void *p, size_t n);
/*
** Adds the given prepared statement to the interpreter. Returns the
** statements opaque identifier (a positive value). Ownerships of
** pStmt is transfered to interp and it must be cleaned up by the
** client by calling Th_FinalizeStmt(), passing it the value returned
** by this function.
**
** If interp is destroyed before all statements are finalized,
** it will finalize them but may emit a warning message.
*/
int Th_AddStmt(Th_Interp *interp, sqlite3_stmt * pStmt);
/*
** Expects stmtId to be a statement identifier returned by
** Th_AddStmt(). On success, finalizes the statement and returns 0.
** On error (statement not found) non-0 is returned. After this
** call, some subsequent call to Th_AddStmt() may return the
** same statement ID.
*/
int Th_FinalizeStmt(Th_Interp *interp, int stmtId);
/*
** Fetches the statement with the given ID, as returned by
** Th_AddStmt(). Returns NULL if stmtId does not refer (or no longer
** refers) to a statement added via Th_AddStmt().
*/
sqlite3_stmt * Th_GetStmt(Th_Interp *interp, int stmtId);
#endif
|
Changes to src/th_lang.c.
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
#include <string.h>
#include <assert.h>
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg){
Th_ErrorMessage(interp, "wrong # args: should be \"", zMsg, -1);
return TH_ERROR;
}
/*
** Syntax:
**
** catch script ?varname?
*/
static int catch_command(
| > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#include <string.h>
#include <assert.h>
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg){
Th_ErrorMessage(interp, "wrong # args: should be \"", zMsg, -1);
return TH_ERROR;
}
int Th_WrongNumArgs2(Th_Interp *interp, const char *zCmdName,
int zCmdLen, const char *zMsg){
char * zBuf = 0;
int nBuf = 0;
Th_StringAppend(interp, &zBuf, &nBuf, zCmdName, zCmdLen);
Th_StringAppend(interp, &zBuf, &nBuf, ": wrong # args: expecting: ", -1);
Th_StringAppend(interp, &zBuf, &nBuf, zMsg, -1);
Th_ErrorMessage(interp, zBuf, NULL, 0);
Th_Free(interp, zBuf);
return TH_ERROR;
}
/*
** Syntax:
**
** catch script ?varname?
*/
static int catch_command(
|
| ︙ | ︙ | |||
1024 1025 1026 1027 1028 1029 1030 |
/*
** Register the built-in th1 language commands with interpreter interp.
** Usually this is called soon after interpreter creation.
*/
int th_register_language(Th_Interp *interp){
/* Array of built-in commands. */
| < < < < | | 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 |
/*
** Register the built-in th1 language commands with interpreter interp.
** Usually this is called soon after interpreter creation.
*/
int th_register_language(Th_Interp *interp){
/* Array of built-in commands. */
struct Th_Command_Reg aCommand[] = {
{"catch", catch_command, 0},
{"expr", expr_command, 0},
{"for", for_command, 0},
{"if", if_command, 0},
{"info", info_command, 0},
{"lindex", lindex_command, 0},
{"list", list_command, 0},
|
| ︙ | ︙ | |||
1054 1055 1056 1057 1058 1059 1060 |
{"return", return_command, 0},
{"break", simple_command, (void *)TH_BREAK},
{"continue", simple_command, (void *)TH_CONTINUE},
{"error", simple_command, (void *)TH_ERROR},
{0, 0, 0}
};
| < < < < < < < < < < | | 1062 1063 1064 1065 1066 1067 1068 1069 1070 |
{"return", return_command, 0},
{"break", simple_command, (void *)TH_BREAK},
{"continue", simple_command, (void *)TH_CONTINUE},
{"error", simple_command, (void *)TH_ERROR},
{0, 0, 0}
};
return Th_register_commands(interp, aCommand);
}
|
Changes to src/th_main.c.
| ︙ | ︙ | |||
40 41 42 43 44 45 46 |
}
static void xFree(void *p){
if( p ){
nOutstandingMalloc--;
}
free(p);
}
| > | > > > > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
}
static void xFree(void *p){
if( p ){
nOutstandingMalloc--;
}
free(p);
}
static Th_Vtab vtab = { xMalloc, xFree, {
NULL,
NULL,
1
}
};
/*
** Generate a TH1 trace message if debugging is enabled.
*/
void Th_Trace(const char *zFormat, ...){
va_list ap;
va_start(ap, zFormat);
|
| ︙ | ︙ | |||
71 72 73 74 75 76 77 |
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
if( argc!=2 ){
| | > > > > > > > | > > > > | > > > > | < < < < < | > > > > > > > > > > | | > > > > | > > > > > > | > > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"BOOLEAN");
}else{
int rc = Th_ToInt(interp, argv[1], argl[1], &enableOutput);
vtab.out.enabled = enableOutput;
return rc;
}
}
int Th_output_f_cgi_content( char const * zData, int nData, void * pState ){
cgi_append_content(zData, nData);
return nData;
}
/*
** Send text to the appropriate output: Either to the console
** or to the CGI reply buffer.
*/
static void sendText(Th_Interp *pInterp, const char *z, int n, int encode){
if(NULL == pInterp){
pInterp = g.interp;
}
assert( NULL != pInterp );
if( enableOutput && n ){
if( n<0 ) n = strlen(z);
if( encode ){
z = htmlize(z, n);
n = strlen(z);
}
Th_output( pInterp, z, n );
if( encode ) fossil_free((char*)z);
}
}
struct PutsCmdData {
char escapeHtml;
char const * sep;
char const * eol;
};
typedef struct PutsCmdData PutsCmdData;
/*
** TH command: puts STRING
** TH command: html STRING
**
** Output STRING as HTML (html) or unchanged (puts).
*/
static int putsCmd(
Th_Interp *interp,
void *pConvert,
int argc,
const char **argv,
int *argl
){
PutsCmdData const * fmt = (PutsCmdData const *)pConvert;
const int sepLen = fmt->sep ? strlen(fmt->sep) : 0;
int i;
if( argc<2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING ...STRING_N");
}
for( i = 1; i < argc; ++i ){
if(sepLen && (i>1)){
sendText(interp, fmt->sep, sepLen, 0);
}
sendText(interp, (char const*)argv[i], argl[i], fmt->escapeHtml);
}
if(fmt->eol){
sendText(interp, fmt->eol, strlen(fmt->eol), 0);
}
return TH_OK;
}
/*
** TH command: wiki STRING
**
** Render the input string as wiki.
*/
static int wikiCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
if( enableOutput ){
Blob src;
blob_init(&src, (char*)argv[1], argl[1]);
wiki_convert(&src, 0, WIKI_INLINE);
blob_reset(&src);
}
|
| ︙ | ︙ | |||
156 157 158 159 160 161 162 |
void *p,
int argc,
const char **argv,
int *argl
){
char *zOut;
if( argc!=2 ){
| | > > | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 |
void *p,
int argc,
const char **argv,
int *argl
){
char *zOut;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
zOut = htmlize((char*)argv[1], argl[1]);
Th_SetResult(interp, zOut, -1);
free(zOut);
return TH_OK;
}
|
| ︙ | ︙ | |||
203 204 205 206 207 208 209 |
void *p,
int argc,
const char **argv,
int *argl
){
int rc;
if( argc!=2 ){
| | > > | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 |
void *p,
int argc,
const char **argv,
int *argl
){
int rc;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
rc = login_has_capability((char*)argv[1],argl[1]);
if( g.thTrace ){
Th_Trace("[hascap %#h] => %d<br />\n", argl[1], argv[1], rc);
}
Th_SetResultInt(interp, rc);
return TH_OK;
|
| ︙ | ︙ | |||
234 235 236 237 238 239 240 |
int argc,
const char **argv,
int *argl
){
int rc = 0;
char const * zArg;
if( argc!=2 ){
| | > > | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 |
int argc,
const char **argv,
int *argl
){
int rc = 0;
char const * zArg;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
zArg = (char const*)argv[1];
if(NULL==zArg){
/* placeholder for following ifdefs... */
}
#if defined(FOSSIL_ENABLE_JSON)
else if( 0 == fossil_strnicmp( zArg, "json", 4 ) ){
|
| ︙ | ︙ | |||
278 279 280 281 282 283 284 |
int argc,
const char **argv,
int *argl
){
int rc = 0;
int i;
if( argc!=2 ){
| | > > | 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 |
int argc,
const char **argv,
int *argl
){
int rc = 0;
int i;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
for(i=0; rc==0 && i<argl[1]; i++){
rc = login_has_capability((char*)&argv[1][i],1);
}
if( g.thTrace ){
Th_Trace("[hascap %#h] => %d<br />\n", argl[1], argv[1], rc);
}
|
| ︙ | ︙ | |||
308 309 310 311 312 313 314 |
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
if( argc!=4 ){
| | > > | | | | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 |
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
if( argc!=4 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"NAME TEXT-LIST NUMLINES");
}
if( enableOutput ){
int height;
Blob name;
int nValue;
const char *zValue;
char *z, *zH;
int nElem;
int *aszElem;
char **azElem;
int i;
if( Th_ToInt(interp, argv[3], argl[3], &height) ) return TH_ERROR;
Th_SplitList(interp, argv[2], argl[2], &azElem, &aszElem, &nElem);
blob_init(&name, (char*)argv[1], argl[1]);
zValue = Th_Fetch(blob_str(&name), &nValue);
z = mprintf("<select name=\"%z\" size=\"%d\">",
htmlize(blob_buffer(&name), blob_size(&name)), height);
sendText(interp, z, -1, 0);
free(z);
blob_reset(&name);
for(i=0; i<nElem; i++){
zH = htmlize((char*)azElem[i], aszElem[i]);
if( zValue && aszElem[i]==nValue
&& memcmp(zValue, azElem[i], nValue)==0 ){
z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>",
zH, zH);
}else{
z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
}
free(zH);
sendText(interp, z, -1, 0);
free(z);
}
sendText(interp, "</select>", -1, 0);
Th_Free(interp, azElem);
}
return TH_OK;
}
/*
** TH1 command: linecount STRING MAX MIN
|
| ︙ | ︙ | |||
366 367 368 369 370 371 372 |
const char **argv,
int *argl
){
const char *z;
int size, n, i;
int iMin, iMax;
if( argc!=4 ){
| | > > | 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 |
const char **argv,
int *argl
){
const char *z;
int size, n, i;
int iMin, iMax;
if( argc!=4 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING MAX MIN");
}
if( Th_ToInt(interp, argv[2], argl[2], &iMax) ) return TH_ERROR;
if( Th_ToInt(interp, argv[3], argl[3], &iMin) ) return TH_ERROR;
z = argv[1];
size = argl[1];
for(n=1, i=0; i<size; i++){
if( z[i]=='\n' ){
|
| ︙ | ︙ | |||
401 402 403 404 405 406 407 |
int argc,
const char **argv,
int *argl
){
int openRepository;
if( argc!=1 && argc!=2 ){
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < | | | > > > > > > > > > > > > > > > > | < | > | < | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 |
int argc,
const char **argv,
int *argl
){
int openRepository;
if( argc!=1 && argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"?BOOLEAN?");
}
if( argc==2 ){
if( Th_ToInt(interp, argv[1], argl[1], &openRepository) ){
return TH_ERROR;
}
if( openRepository ) db_find_and_open_repository(OPEN_OK_NOT_FOUND, 0);
}
Th_SetResult(interp, g.zRepositoryName, -1);
return TH_OK;
}
extern const char *find_option(const char *zLong, const char *zShort, int hasArg);
/*
** TH Syntax:
**
** argv_len
**
** Returns the number of command-line arguments.
*/
static int argvArgcCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
Th_SetResultInt( interp, g.argc );
return TH_OK;
}
#define TH_USE_ARGV
#ifdef TH_USE_ARGV
/*
** TH Syntax:
**
** argv_getat Index
**
** Returns the raw argument at the given index, throwing if
** out of bounds.
*/
static int argvGetAtCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
char const * zVal;
int pos = 0;
if( argc != 2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"Index");
}
if( TH_OK != Th_ToInt(interp, argv[1], argl[1], &pos) ){
return TH_ERROR;
}
if( pos < 0 || pos >= g.argc ){
Th_ErrorMessage(interp, "Argument out of range:", argv[1], argl[1]);
return TH_ERROR;
}
if( 0 == pos ){/*special case*/
zVal = fossil_nameofexe();
}else{
zVal = (pos>0 && pos<g.argc) ? g.argv[pos] : 0;
}
Th_SetResult( interp, zVal, zVal ? strlen(zVal) : 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** argv_getstr longName ??shortName? ?defaultValue??
**
** Functions more or less like Fossil's find_option().
** If the given argument is found then its value is returned,
** else defaultValue is returned. If that is not set
** and the option is not found, an error is thrown.
** If defaultValue is provided, shortName must also be provided
** but it may be empty. For example:
**
** set foo [argv_getstr foo "" "hi, world"]
**
** ACHTUNG: find_option() removes any entries it finds from
** g.argv, such that future calls to find_option() will not
** find the same option.
*/
static int argvFindOptionStringCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
enum { BufLen = 100 };
char zLong[BufLen] = {0};
char zShort[BufLen] = {0};
char aBuf[BufLen] = {0};
int hasArg;
char const * zVal = NULL;
char const * zDefault = NULL;
int check;
if( 1 < argc ){
assert( argl[1] < BufLen );
check = snprintf( zLong, BufLen, "%s", argv[1] );
assert( check <= BufLen );
}
if( (2 < argc) && (0 < argl[2]) ){
assert( argl[2] < BufLen );
check = snprintf( zShort, BufLen, "%s", argv[2] );
assert( check <= BufLen );
}
if( 3 < argc){
zDefault = argv[3];
}
if(0 == zLong[0]){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"longName ?shortName? ?defaultVal?");
}
zVal = find_option( zLong, zShort[0] ? zShort : NULL, 1 );
if(!zVal){
zVal = zDefault;
if(!zVal){
Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1);
return TH_ERROR;
}
}
Th_SetResult( interp, zVal, zVal ? strlen(zVal) : 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** argv_getbool longName ??shortName? ?defaultValue??
**
** Works just like argv_getstr but treats any empty value or one
** starting with the digit '0' as a boolean false.
**
** Returns the result as an integer 0 (false) or 1 (true).
*/
static int argvFindOptionBoolCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
enum { BufLen = 100 };
char zLong[BufLen] = {0};
char zShort[BufLen] = {0};
char aBuf[BufLen] = {0};
int hasArg;
char const * zVal = NULL;
char const * zDefault = NULL;
int val;
int rc;
int check;
if( 1 < argc ){
assert( argl[1] < BufLen );
check = snprintf( zLong, BufLen, "%s", argv[1] );
assert( check <= BufLen );
}
if( (2 < argc) && (0 < argl[2]) ){
assert( argl[2] < BufLen );
check = snprintf( zShort, BufLen, "%s", argv[2] );
assert( check <= BufLen );
}
if( 3 < argc){
zDefault = argv[3];
}
if(0 == zLong[0]){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"longName ?shortName? ?defaultVal?");
}
zVal = find_option( zLong, zShort[0] ? zShort : NULL, 0 );
if(zVal && !*zVal){
zVal = "1";
}
if(!zVal){
zVal = zDefault;
if(!zVal){
Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1);
return TH_ERROR;
}
}
if( !*zVal ){
zVal = "0";
}
zVal = (zVal && *zVal && (*zVal!='0')) ? zVal : 0;
Th_SetResultInt( interp, zVal ? 1 : 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** argv_getint longName ?shortName? ?defaultValue?
*/
static int argvFindOptionIntCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
enum { BufLen = 100 };
char zLong[BufLen] = {0};
char zShort[BufLen] = {0};
char aBuf[BufLen] = {0};
int hasArg;
char const * zVal = NULL;
char const * zDefault = NULL;
int val = 0;
int check;
if( 1 < argc ){
assert( argl[1] < BufLen );
check = snprintf( zLong, BufLen, "%s", argv[1] );
assert( check <= BufLen );
}
if( (2 < argc) && (0 < argl[2]) ){
assert( argl[2] < BufLen );
check = snprintf( zShort, BufLen, "%s", argv[2] );
assert( check <= BufLen );
}
if( 3 < argc){
zDefault = argv[3];
}
if(0 == zLong[0]){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"longName ?shortName? ?defaultVal?");
}
zVal = find_option( zLong, zShort[0] ? zShort : NULL, 0 );
if(!zVal){
zVal = zDefault;
if(!zVal){
Th_ErrorMessage(interp, "Option not found and no default provided:", zLong, -1);
return TH_ERROR;
}
}
Th_ToInt(interp, zVal, strlen(zVal), &val);
Th_SetResultInt( interp, val );
return TH_OK;
}
#endif
/* end TH_USE_ARGV */
#ifdef TH_USE_SQLITE
/*
** TH Syntax:
**
** query_prepare SQL
**
** Returns an opaque statement identifier.
*/
static int queryPrepareCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
char const * zSql;
sqlite3_stmt * pStmt = NULL;
int rc;
char const * errMsg = NULL;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"STRING");
}
zSql = argv[1];
rc = sqlite3_prepare( g.db, zSql, strlen(zSql), &pStmt, NULL );
if(SQLITE_OK==rc){
if(sqlite3_column_count( pStmt ) < 1){
errMsg = "Only SELECT-like queries are supported.";
rc = SQLITE_ERROR;
sqlite3_finalize( pStmt );
pStmt = NULL;
}
}else{
errMsg = sqlite3_errmsg( g.db );
}
if(SQLITE_OK!=rc){
assert(NULL != errMsg);
assert(NULL == pStmt);
Th_ErrorMessage(interp, "error preparing SQL:", errMsg, -1);
return TH_ERROR;
}
rc = Th_AddStmt( interp, pStmt );
assert( rc >= 0 && "AddStmt failed.");
Th_SetResultInt( interp, rc );
return TH_OK;
}
/*
** Tries to convert arg, which must be argLen bytes long, to a
** statement handle id and, in turn, to a sqlite3_stmt. On success
** (the argument references a prepared statement) it returns the
** handle and stmtId (if not NULL) is assigned to the integer value of
** arg. On error NULL is returned and stmtId might be modified (if not
** NULL). If stmtId is unmodified after an error then it is not a
** number, else it is a number but does not reference an opened
** statement.
*/
static sqlite3_stmt * queryStmtHandle(Th_Interp *interp, char const * arg, int argLen, int * stmtId ){
int rc = 0;
sqlite3_stmt * pStmt = NULL;
if( 0 == Th_ToInt( interp, arg, argLen, &rc ) ){
if(stmtId){
*stmtId = rc;
}
pStmt = Th_GetStmt( interp, rc );
if(NULL==pStmt){
Th_ErrorMessage(interp, "no such statement handle:", arg, -1);
}
}
return pStmt;
}
/*
** TH Syntax:
**
** query_finalize stmtId
**
** sqlite3_finalize()s the given statement.
*/
static int queryFinalizeCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
char * zSql;
sqlite3_stmt * pStmt = NULL;
int rc = 0;
char const * arg;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle");
}
arg = argv[1];
pStmt = queryStmtHandle(interp, arg, argl[1], &rc);
if( rc < 1 ){
return TH_ERROR;
}
assert( NULL != pStmt );
rc = Th_FinalizeStmt( interp, rc );
Th_SetResultInt( interp, rc );
return TH_OK;
}
/*
** Reports the current sqlite3_errmsg() via TH and returns TH_ERROR.
*/
static int queryReportDbErr( Th_Interp * interp ){
char const * msg = sqlite3_errmsg( g.db );
Th_ErrorMessage(interp, "db error:", msg, -1);
return TH_ERROR;
}
/*
** Internal helper for fetching statement handle and index parameters.
** The first 4 args should be the args passed to the TH1 callback.
** pStmt must be a pointer to a NULL pointer. pIndex may be NULL or
** a pointer to store the statement index argument in. If pIndex is
** NULL then argc is asserted to be at least 2, else it must be at
** least 3.
**
** On success it returns 0, sets *pStmt to the referenced statement
** handle, and pIndex (if not NULL) to the integer value of argv[2]
** argument. On error it reports the error via TH, returns non-0, and
** modifies neither pStmt not pIndex.
*/
static int queryStmtIndexArgs(
Th_Interp * interp,
int argc,
char const ** argv,
int *argl,
sqlite3_stmt ** pStmt,
int * pIndex ){
int index = 0;
sqlite3_stmt * stmt;
if( !pIndex ){
if(argc<2){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle");
}
}else{
if( argc<3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
if( 0 != Th_ToInt( interp, argv[2], argl[2], &index ) ){
return TH_ERROR;
}
}
stmt = queryStmtHandle(interp, argv[1], argl[1], NULL);
if( NULL == stmt ){
return TH_ERROR;
}else{
*pStmt = stmt;
if( pIndex ){
*pIndex = index;
}
return 0;
}
}
/*
** TH Syntax:
**
** query_step stmtId
**
** Steps the given statement handle. Returns 0 at the end of the set,
** a positive value if it fetches a row, and throws on error.
*/
static int queryStepCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc = 0;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle");
}
if(0 != queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, NULL)){
return TH_ERROR;
}
assert(NULL != pStmt);
rc = sqlite3_step( pStmt );
switch(rc){
case SQLITE_ROW:
rc = 1;
break;
case SQLITE_DONE:
rc = 0;
break;
default:
return queryReportDbErr( interp );
}
Th_SetResultInt( interp, rc );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_string stmtId Index
**
** Returns the result column value at the given 0-based index.
*/
static int queryColStringCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
char const * val;
int index = -1;
int valLen;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 0){
return TH_ERROR;
}
val = sqlite3_column_text( pStmt, index );
valLen = val ? sqlite3_column_bytes( pStmt, index ) : 0;
Th_SetResult( interp, val, valLen );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_int stmtId Index
**
** Returns the result column value at the given 0-based index.
*/
static int queryColIntCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc = 0;
int index = -1;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 0){
return TH_ERROR;
}
Th_SetResultInt( interp, sqlite3_column_int( pStmt, index ) );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_double stmtId Index
**
** Returns the result column value at the given 0-based index.
*/
static int queryColDoubleCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
double rc = 0;
int index = -1;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 0){
return TH_ERROR;
}
Th_SetResultDouble( interp, sqlite3_column_double( pStmt, index ) );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_is_null stmtId Index
**
** Returns non-0 if the given 0-based result column index contains
** an SQL NULL value, else returns 0.
*/
static int queryColIsNullCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
double rc = 0;
int index = -1;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 0){
return TH_ERROR;
}
Th_SetResultInt( interp,
SQLITE_NULL==sqlite3_column_type( pStmt, index )
? 1 : 0);
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_type stmtId Index
**
** Returns the sqlite type identifier for the given 0-based result
** column index. The values are available in TH as $SQLITE_NULL,
** $SQLITE_INTEGER, etc.
*/
static int queryColTypeCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
double rc = 0;
int index = -1;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 0){
return TH_ERROR;
}
Th_SetResultInt( interp, sqlite3_column_type( pStmt, index ) );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_count stmtId
**
** Returns the number of result columns in the query.
*/
static int queryColCountCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
int rc;
sqlite3_stmt * pStmt = NULL;
if( argc!=2 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle");
}
pStmt = queryStmtHandle(interp, argv[1], argl[1], NULL);
if( NULL == pStmt ){
return TH_ERROR;
}
rc = sqlite3_column_count( pStmt );
Th_SetResultInt( interp, rc );
return TH_OK;
}
/*
** TH Syntax:
**
** query_col_count stmtId Index
**
** Returns the result column name at the given 0-based index.
*/
static int queryColNameCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
char const * val;
int index;
int rc = 0;
int valLen;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
pStmt = queryStmtHandle(interp, argv[1], argl[1], &rc);
if( rc < 1 ){
return TH_ERROR;
}
if( 0 != Th_ToInt( interp, argv[2], argl[2], &index ) ){
return TH_ERROR;
}
val = sqlite3_column_name( pStmt, index );
if(NULL==val){
Th_ErrorMessage(interp, "Column index out of bounds(?):", argv[2], -1);
return TH_ERROR;
}else{
Th_SetResult( interp, val, strlen( val ) );
return TH_OK;
}
}
/*
** TH Syntax:
**
** query_bind_null stmtId Index
**
** Binds a value to the given 1-based parameter index.
*/
static int queryBindNullCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc;
int index = 0;
if( argc!=3 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 1){
return TH_ERROR;
}
rc = sqlite3_bind_null( pStmt, index );
if(rc){
return queryReportDbErr( interp );
}
Th_SetResultInt( interp, 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** query_bind_string stmtId Index Value
**
** Binds a value to the given 1-based parameter index.
*/
static int queryBindStringCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc;
int index = 0;
if( argc!=4 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index Value");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 1){
return TH_ERROR;
}
rc = sqlite3_bind_text( pStmt, index, argv[3], argl[3], SQLITE_TRANSIENT );
if(rc){
return queryReportDbErr( interp );
}
Th_SetResultInt( interp, 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** query_bind_int stmtId Index Value
**
** Binds a value to the given 1-based parameter index.
*/
static int queryBindIntCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc;
int val;
int index = 0;
if( argc!=4 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index Value");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 1){
return TH_ERROR;
}
if( 0 != Th_ToInt( interp, argv[3], argl[3], &val ) ){
return TH_ERROR;
}
rc = sqlite3_bind_int( pStmt, index, val );
if(rc){
return queryReportDbErr( interp );
}
Th_SetResultInt( interp, 0 );
return TH_OK;
}
/*
** TH Syntax:
**
** query_bind_double stmtId Index Value
**
** Binds a value to the given 1-based parameter index.
*/
static int queryBindDoubleCmd(
Th_Interp *interp,
void *p,
int argc,
const char **argv,
int *argl
){
sqlite3_stmt * pStmt = NULL;
int rc;
double val;
int index = 0;
if( argc!=4 ){
return Th_WrongNumArgs2(interp,
argv[0], argl[0],
"StmtHandle Index Value");
}
queryStmtIndexArgs(interp, argc, argv, argl, &pStmt, &index);
if(index < 1){
return TH_ERROR;
}
if( 0 != Th_ToDouble( interp, argv[3], argl[3], &val ) ){
return TH_ERROR;
}
rc = sqlite3_bind_double( pStmt, index, val );
if(rc){
return queryReportDbErr( interp );
}
Th_SetResultInt( interp, 0 );
return TH_OK;
}
int th_register_sqlite(Th_Interp *interp){
enum { BufLen = 100 };
char buf[BufLen];
int i, l;
#define SET(K) l = snprintf(buf, BufLen, "%d", K); \
Th_SetVar( interp, #K, strlen(#K), buf, l );
SET(SQLITE_BLOB);
SET(SQLITE_DONE);
SET(SQLITE_ERROR);
SET(SQLITE_FLOAT);
SET(SQLITE_INTEGER);
SET(SQLITE_NULL);
SET(SQLITE_OK);
SET(SQLITE_ROW);
SET(SQLITE_TEXT);
#undef SET
static Th_Command_Reg aCommand[] = {
{"query_bind_int", queryBindIntCmd, 0},
{"query_bind_double", queryBindDoubleCmd,0},
{"query_bind_null", queryBindNullCmd, 0},
{"query_bind_string", queryBindStringCmd,0},
{"query_col_count", queryColCountCmd, 0},
{"query_col_double", queryColDoubleCmd, 0},
{"query_col_int", queryColIntCmd, 0},
{"query_col_is_null", queryColIsNullCmd, 0},
{"query_col_name", queryColNameCmd, 0},
{"query_col_string", queryColStringCmd, 0},
{"query_col_type", queryColTypeCmd, 0},
{"query_finalize", queryFinalizeCmd, 0},
{"query_prepare", queryPrepareCmd, 0},
{"query_step", queryStepCmd, 0},
{0, 0, 0}
};
Th_register_commands( interp, aCommand );
}
#endif
/* end TH_USE_SQLITE */
int Th_register_commands( Th_Interp * interp,
Th_Command_Reg const * aCommand ){
int i;
int rc = TH_OK;
for(i=0; (TH_OK==rc) && aCommand[i].zName; ++i){
if ( !aCommand[i].zName ) break;
else if( !aCommand[i].xProc ) continue;
else{
rc = Th_CreateCommand(interp, aCommand[i].zName, aCommand[i].xProc,
aCommand[i].pContext, 0);
}
}
return rc;
}
/*
** Make sure the interpreter has been initialized. Initialize it if
** it has not been already.
**
** The interpreter is stored in the g.interp global variable.
*/
void Th_FossilInit(void){
static PutsCmdData puts_Html = {0, 0, 0};
static PutsCmdData puts_Normal = {1, 0, 0};
static Th_Command_Reg aCommand[] = {
{"anycap", anycapCmd, 0},
{"combobox", comboboxCmd, 0},
{"enable_output", enableOutputCmd, 0},
{"linecount", linecntCmd, 0},
{"hascap", hascapCmd, 0},
{"hasfeature", hasfeatureCmd, 0},
{"htmlize", htmlizeCmd, 0},
{"date", dateCmd, 0},
{"html", putsCmd, &puts_Html},
{"puts", putsCmd, &puts_Normal},
{"wiki", wikiCmd, 0},
{"repository", repositoryCmd, 0},
#ifdef TH_USE_ARGV
{"argv_len", argvArgcCmd, 0},
{"argv_getat", argvGetAtCmd, 0},
{"argv_getstr", argvFindOptionStringCmd, 0},
{"argv_getbool", argvFindOptionBoolCmd, 0},
{"argv_getint", argvFindOptionIntCmd, 0},
#endif
{0, 0, 0}
};
if( g.interp==0 ){
int i;
if(g.cgiOutput){
vtab.out.f = Th_output_f_cgi_content;
}else{
vtab.out.f = Th_output_f_FILE;
vtab.out.pState = stdout;
}
vtab.out.enabled = enableOutput;
g.interp = Th_CreateInterp(&vtab);
th_register_language(g.interp); /* Basic scripting commands. */
#ifdef FOSSIL_ENABLE_TCL
if( getenv("TH1_ENABLE_TCL")!=0 || db_get_boolean("tcl", 0) ){
th_register_tcl(g.interp, &g.tcl); /* Tcl integration commands. */
}
#endif
#ifdef TH_USE_SQLITE
th_register_sqlite(g.interp);
#endif
Th_register_commands( g.interp, aCommand );
}
}
/*
** Store a string value in a variable in the interpreter.
*/
void Th_Store(const char *zName, const char *zValue){
|
| ︙ | ︙ | |||
570 571 572 573 574 575 576 |
char *zResult;
Th_FossilInit();
while( z[i] ){
if( z[i]=='$' && (n = validVarName(&z[i+1]))>0 ){
const char *zVar;
int nVar;
int encode = 1;
| | | | | | | | > > > > > > > > > < > > | 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 |
char *zResult;
Th_FossilInit();
while( z[i] ){
if( z[i]=='$' && (n = validVarName(&z[i+1]))>0 ){
const char *zVar;
int nVar;
int encode = 1;
sendText(g.interp, z, i, 0);
if( z[i+1]=='<' ){
/* Variables of the form $<aaa> are html escaped */
zVar = &z[i+2];
nVar = n-2;
}else{
/* Variables of the form $aaa are output raw */
zVar = &z[i+1];
nVar = n;
encode = 0;
}
rc = Th_GetVar(g.interp, (char*)zVar, nVar);
z += i+1+n;
i = 0;
zResult = (char*)Th_GetResult(g.interp, &n);
sendText(g.interp, (char*)zResult, n, encode);
}else if( z[i]=='<' && isBeginScriptTag(&z[i]) ){
sendText(g.interp, z, i, 0);
z += i+5;
for(i=0; z[i] && (z[i]!='<' || !isEndScriptTag(&z[i])); i++){}
rc = Th_Eval(g.interp, 0, (const char*)z, i);
if( rc!=TH_OK ) break;
z += i;
if( z[0] ){ z += 6; }
i = 0;
}else{
i++;
}
}
if( rc==TH_ERROR ){
sendText(g.interp, "<hr><p class=\"thmainError\">ERROR: ", -1, 0);
zResult = (char*)Th_GetResult(g.interp, &n);
sendText(g.interp, (char*)zResult, n, 1);
sendText(g.interp, "</p>", -1, 0);
}else{
sendText(g.interp, z, i, 0);
}
return rc;
}
/*
** COMMAND: test-th-render
** COMMAND: th1
**
** Processes a file provided on the command line as a TH1-capable
** script/page. Output is sent to stdout or the CGI output buffer, as
** appropriate. The input file is assumed to be text/wiki/HTML content
** which may contain TH1 tag blocks. Each block is executed in the
** same TH1 interpreter instance.
**
*/
void test_th_render(void){
Blob in;
if( g.argc<3 ){
usage("FILE");
assert(0 && "usage() does not return");
}
blob_zero(&in);
db_open_config(0); /* Needed for global "tcl" setting. */
db_find_and_open_repository(OPEN_ANY_SCHEMA,0) /* for query_xxx tests. */;
blob_read_from_file(&in, g.argv[2]);
Th_Render(blob_str(&in));
}
|
Added test/th1-query-api-1.th1.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 |
This is not a formal test suite, but a tinkering ground.
Run it through "fossil test-th-render THIS_FILE".
<th1>
proc bar {} {
puts "json ?= [hasfeature json]\n"
puts "tcl ?= [hasfeature tcl]\n"
puts "ssl ?= [hasfeature ssl]\n"
puts [lindex {a b c} 1] "\n"
proc foo {a {b steve}} {
puts "a = ${a}\n"
puts "b = ${b}\n"
}
foo hi world
foo hi {string list}
# foo
puts a b c foo \n
}
bar
foo leaky
proc xyz {} {
return 42
}
set a [xyz]
puts "a=${a}" ! \n
set stmt [query_prepare {SELECT login, cap FROM user}]
set colCount [query_col_count $stmt]
puts "query column count: ${colCount}\n"
puts "stmt id=${stmt}\n"
proc noop {} {}
proc incr {name {step 1}} {
upvar $name x
set x [expr $x+$step]
}
set sep " "
set i 0
set colNames(0) 0
for {set i 0} {$i < $colCount} {incr i} {
set colNames($i) [query_col_name $stmt $i]
puts "colNames($i)=" $colNames($i) "\n"
}
for {set row 0} {0 < [query_step $stmt]} {incr row} {
for {set i 0} {$i < $colCount} {incr i} {
if {$i > 0} {
puts $sep
} else {
puts "#$row: $sep"
}
puts $colNames($i) = [query_col_string $stmt $i]
}
puts "\n"
}
unset row
query_finalize $stmt
proc query_step_each {{stmt} {callback}} {
set colNames(0) 0
set colCount [query_col_count $stmt]
for {set i 0} {$i < $colCount} {incr i} {
set colNames($i) [query_col_name $stmt $i]
}
upvar cb $callback
for {set row 0} {0 < [query_step $stmt]} {incr row} {
#puts "Calling callback: $stmt $colCount colNames\n"
$callback $stmt $colCount
}
}
set sql {SELECT uid, login FROM user WHERE uid!=?}
#set sql {SELECT uid, login FROM user WHERE login=?}
#set sql {SELECT tagid, value, null FROM tagxref WHERE value IS ? LIMIT 3}
set stmt [query_prepare $sql]
puts "stmt ID=" $stmt "\n"
query_bind_int $stmt 1 3
#set stmt [query_prepare $sql]
#query_bind_string $stmt 1 stephan
#set stmt [query_prepare $sql]
#query_bind_null $stmt 1
set rc 0
puts "USER LIST:\n"
catch {
proc my_each {stmt colCount} {
upvar 2 sep sep
puts [query_col_int $stmt 0] " (type=" [query_col_type $stmt 0] ")" $sep
puts [query_col_double $stmt 0] $sep
puts [query_col_string $stmt 1] " (type=" [query_col_type $stmt 1] ")" $sep
puts "isnull 0 ?= " [query_col_is_null $stmt 0] $sep
puts "isnull 2 ?= " [query_col_is_null $stmt 2]
# for {set i 0} {$i < $colCount} {incr i} {
# if {$i > 0} { puts $sep }
# }
puts "\n"
# error "hi!"
}
query_step_each $stmt my_each
# query_step_each $stmt {
# proc each {stmt cc} { puts hi "\n" }
# }
} rc
query_finalize $stmt
puts rc = $rc "\n"
set consts [list SQLITE_BLOB SQLITE_DONE SQLITE_ERROR SQLITE_FLOAT SQLITE_INTEGER SQLITE_NULL SQLITE_OK SQLITE_ROW SQLITE_TEXT]
#set consts $SQLITE_CONSTANTS
puts consts = $consts "\n"
for {set i 0} {$i < [llength $consts]} {incr i} {
set x [lindex $consts $i]
puts \$$x = [expr \$$x] "\n"
}
set ARGC [argv_len]
puts ARGC = $ARGC "\n"
for {set i 0} {$i < $ARGC} {incr i} {
puts "argv_getat $i = " [argv_getat $i] \n
}
set magicDefault hi
set optA [argv_getstr AA a $magicDefault]
puts "argv_getstr AA = " $optA \n
set optA [argv_getbool BB b 0]
puts "argv_getbool BB = " $optA \n
set exception 0
catch {
argv_getint noSuchOptionAndNoDefault
} exception
puts exception = $exception "\n"
enable_output 1
proc multiStmt {} {
set max 5
set i 0
set s(0) 0
for {set i 0} {$i < $max} {incr i} {
set s($i) [query_prepare "SELECT $i"]
puts "s($i) = $s($i)\n"
}
for {set i 0} {$i < $max} {incr i} {
query_step $s($i)
}
for {set i 0} {$i < $max} {incr i} {
puts "closing stmt $s($i)\n"
query_finalize $s($i)
}
puts "Preparing again\n"
for {set i 0} {$i < $max} {incr i} {
set s($i) [query_prepare "SELECT $i"]
puts "s($i) = $s($i)\n"
}
for {set i 0} {$i < $max} {incr i} {
query_step $s($i)
}
puts "Closing again\n"
for {set i 0} {$i < $max} {incr i} {
puts "closing stmt $s($i)\n"
query_finalize $s($i)
}
}
multiStmt
enable_output 1
puts "If you got this far, you win!\n"
</th1>
|