diff options
Diffstat (limited to 'kexi/3rdparty/kexisql3/src')
-rw-r--r-- | kexi/3rdparty/kexisql3/src/alter.c | 2 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/btree.c | 16 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/pager.c | 4 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/parse.y | 2 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/pragma.c | 8 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/select.c | 14 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/vdbe.c | 4 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/vdbeaux.c | 6 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/vdbemem.c | 2 | ||||
-rw-r--r-- | kexi/3rdparty/kexisql3/src/where.c | 26 |
10 files changed, 42 insertions, 42 deletions
diff --git a/kexi/3rdparty/kexisql3/src/alter.c b/kexi/3rdparty/kexisql3/src/alter.c index 73c49b1f..72ebd6c7 100644 --- a/kexi/3rdparty/kexisql3/src/alter.c +++ b/kexi/3rdparty/kexisql3/src/alter.c @@ -53,7 +53,7 @@ static void renameTableFunc( /* The principle used to locate the table name in the CREATE TABLE ** statement is that the table name is the first token that is immediatedly - ** followed by a left tqparenthesis - TK_LP. + ** followed by a left parenthesis - TK_LP. */ if( zSql ){ do { diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c index 65cddcd4..fb54c9c4 100644 --- a/kexi/3rdparty/kexisql3/src/btree.c +++ b/kexi/3rdparty/kexisql3/src/btree.c @@ -2080,7 +2080,7 @@ int sqlite3BtreeCommitStmt(Btree *pBt){ ** Rollback the active statement subtransaction. If no subtransaction ** is active this routine is a no-op. ** -** All cursors will be tqinvalidated by this operation. Any attempt +** All cursors will be invalidated by this operation. Any attempt ** to use a cursor that was open at the beginning of this operation ** will result in an error. */ @@ -3670,9 +3670,9 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ int szCell; CellInfo info; Btree *pBt = pPage->pBt; - int tqparentIdx = pParent->nCell; /* pParent new divider cell index */ - int tqparentSize; /* Size of new divider cell */ - u8 tqparentCell[64]; /* Space for the new divider cell */ + int parentIdx = pParent->nCell; /* pParent new divider cell index */ + int parentSize; /* Size of new divider cell */ + u8 parentCell[64]; /* Space for the new divider cell */ /* Allocate a new page. Insert the overflow cell from pPage ** into it. Then remove the overflow cell from pPage. @@ -3697,16 +3697,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ */ assert( pPage->nCell>0 ); parseCellPtr(pPage, findCell(pPage, pPage->nCell-1), &info); - rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, &tqparentSize); + rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, &parentSize); if( rc!=SQLITE_OK ){ return rc; } - assert( tqparentSize<64 ); - rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4); + assert( parentSize<64 ); + rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4); if( rc!=SQLITE_OK ){ return rc; } - put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno); + put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno); put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew); #ifndef SQLITE_OMIT_AUTOVACUUM diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c index 469d05fa..b49a37d5 100644 --- a/kexi/3rdparty/kexisql3/src/pager.c +++ b/kexi/3rdparty/kexisql3/src/pager.c @@ -839,7 +839,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){ /* ** Unlock the database and clear the in-memory cache. This routine ** sets the state of the pager back to what it was when it was first -** opened. Any outstanding pages are tqinvalidated and subsequent attempts +** opened. Any outstanding pages are invalidated and subsequent attempts ** to access those pages will likely result in a coredump. */ static void pager_reset(Pager *pPager){ @@ -1948,7 +1948,7 @@ int sqlite3pager_truncate(Pager *pPager, Pgno nPage){ ** Shutdown the page cache. Free all memory and close all files. ** ** If a transaction was in progress when this routine is called, that -** transaction is rolled back. All outstanding pages are tqinvalidated +** transaction is rolled back. All outstanding pages are invalidated ** and their memory is freed. Any attempt to use a page associated ** with this page cache after this function returns will likely ** result in a coredump. diff --git a/kexi/3rdparty/kexisql3/src/parse.y b/kexi/3rdparty/kexisql3/src/parse.y index c591c99d..7487c731 100644 --- a/kexi/3rdparty/kexisql3/src/parse.y +++ b/kexi/3rdparty/kexisql3/src/parse.y @@ -398,7 +398,7 @@ seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP } // A seltablist_paren nonterminal represents anything in a FROM that -// is contained inside tqparentheses. This can be either a subquery or +// is contained inside parentheses. This can be either a subquery or // a grouping of table and subqueries. // %type seltablist_paren {Select*} diff --git a/kexi/3rdparty/kexisql3/src/pragma.c b/kexi/3rdparty/kexisql3/src/pragma.c index 618ce9e1..181d9a94 100644 --- a/kexi/3rdparty/kexisql3/src/pragma.c +++ b/kexi/3rdparty/kexisql3/src/pragma.c @@ -86,7 +86,7 @@ static int getTempStore(const char *z){ ** Invalidate temp storage, either when the temp storage is changed ** from default, or when 'file' and the temp_store_directory has changed */ -static int tqinvalidateTempStorage(Parse *pParse){ +static int invalidateTempStorage(Parse *pParse){ sqlite3 *db = pParse->db; if( db->aDb[1].pBt!=0 ){ if( db->flags & SQLITE_InTrans ){ @@ -112,7 +112,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){ int ts = getTempStore(zStorageType); sqlite3 *db = pParse->db; if( db->temp_store==ts ) return SQLITE_OK; - if( tqinvalidateTempStorage( pParse ) != SQLITE_OK ){ + if( invalidateTempStorage( pParse ) != SQLITE_OK ){ return SQLITE_ERROR; } db->temp_store = ts; @@ -377,7 +377,7 @@ void sqlite3Pragma( ** Return or set the local value of the temp_store_directory flag. Changing ** the value sets a specific directory to be used for temporary files. ** Setting to a null string reverts to the default temporary directory search. - ** If temporary directory is changed, then tqinvalidateTempStorage. + ** If temporary directory is changed, then invalidateTempStorage. ** */ if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){ @@ -397,7 +397,7 @@ void sqlite3Pragma( || (TEMP_STORE==1 && db->temp_store<=1) || (TEMP_STORE==2 && db->temp_store==1) ){ - tqinvalidateTempStorage(pParse); + invalidateTempStorage(pParse); } sqliteFree(sqlite3_temp_directory); if( zRight[0] ){ diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c index 0f465c09..fd8b41a8 100644 --- a/kexi/3rdparty/kexisql3/src/select.c +++ b/kexi/3rdparty/kexisql3/src/select.c @@ -2569,7 +2569,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ ** This routine does NOT free the Select structure passed in. The ** calling function needs to do that. ** -** The pParent, tqparentTab, and *pParentAgg fields are filled in if this +** The pParent, parentTab, and *pParentAgg fields are filled in if this ** SELECT is a subquery. This routine may try to combine this SELECT ** with its tqparent to form a single flat query. In so doing, it might ** change the tqparent query from a non-aggregate to an aggregate query. @@ -2587,7 +2587,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ ** pParent will be NULL. During the processing of the outer query, this ** routine is called recursively to handle the subquery. For the recursive ** call, pParent will point to the outer query. Because the subquery is -** the second element in a three-way join, the tqparentTab parameter will +** the second element in a three-way join, the parentTab parameter will ** be 1 (the 2nd value of a 0-indexed array.) */ int sqlite3Select( @@ -2596,7 +2596,7 @@ int sqlite3Select( int eDest, /* How to dispose of the results */ int iParm, /* A parameter used by the eDest disposal method */ Select *pParent, /* Another SELECT for which this is a sub-query */ - int tqparentTab, /* Index in pParent->pSrc of this query */ + int parentTab, /* Index in pParent->pSrc of this query */ int *pParentAgg, /* True if pParent uses aggregate functions */ char *aff /* If eDest is SRT_Union, the affinity string */ ){ @@ -2735,7 +2735,7 @@ int sqlite3Select( */ #ifndef SQLITE_OMIT_VIEW if( pParent && pParentAgg && - flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){ + flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){ if( isAgg ) *pParentAgg = 1; goto select_end; } @@ -3105,10 +3105,10 @@ int sqlite3Select( ** the use of the temporary table. */ if( pParent ){ - assert( pParent->pSrc->nSrc>tqparentTab ); - assert( pParent->pSrc->a[tqparentTab].pSelect==p ); + assert( pParent->pSrc->nSrc>parentTab ); + assert( pParent->pSrc->a[parentTab].pSelect==p ); sqlite3SelectDelete(p); - pParent->pSrc->a[tqparentTab].pSelect = 0; + pParent->pSrc->a[parentTab].pSelect = 0; } #endif diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c index c5582b5c..1b5678fd 100644 --- a/kexi/3rdparty/kexisql3/src/vdbe.c +++ b/kexi/3rdparty/kexisql3/src/vdbe.c @@ -121,7 +121,7 @@ int sqlite3_sort_count = 0; ** Convert the given stack entity into a integer if it isn't one ** already. ** -** Any prior string or real representation is tqinvalidated. +** Any prior string or real representation is invalidated. ** NULLs are converted into 0. */ #define Integerify(P) sqlite3VdbeMemIntegerify(P) @@ -129,7 +129,7 @@ int sqlite3_sort_count = 0; /* ** Convert P so that it has type MEM_Real. ** -** Any prior string or integer representation is tqinvalidated. +** Any prior string or integer representation is invalidated. ** NULLs are converted into 0.0. */ #define Realify(P) sqlite3VdbeMemRealify(P) diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c index 6b37312d..33c812bf 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeaux.c +++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c @@ -189,20 +189,20 @@ static int opcodeNoPush(u8 op){ ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains ** one bit for opcodes 16 to 31, and so on. ** - ** 16-bit bittqmasks (rather than 32-bit) are specified in opcodes.h + ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h ** because the file is generated by an awk program. Awk manipulates ** all numbers as floating-point and we don't want to risk a rounding ** error if someone builds with an awk that uses (for example) 32-bit ** IEEE floats. */ - static const u32 tqmasks[5] = { + static const u32 masks[5] = { NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16), NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16), NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16), NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16), NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16) }; - return (tqmasks[op>>5] & (1<<(op&0x1F))); + return (masks[op>>5] & (1<<(op&0x1F))); } #ifndef NDEBUG diff --git a/kexi/3rdparty/kexisql3/src/vdbemem.c b/kexi/3rdparty/kexisql3/src/vdbemem.c index a7ecce53..0b7e193b 100644 --- a/kexi/3rdparty/kexisql3/src/vdbemem.c +++ b/kexi/3rdparty/kexisql3/src/vdbemem.c @@ -151,7 +151,7 @@ int sqlite3VdbeMemNulTerminate(Mem *pMem){ ** are converted using sqlite3_snprintf(). Converting a BLOB to a string ** is a no-op. ** -** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated. +** Existing representations MEM_Int and MEM_Real are *not* invalidated. ** ** A MEM_Null value will never be passed to this function. This function is ** used for converting values to text for returning to the user (i.e. via diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c index ab19f288..f4b8ba51 100644 --- a/kexi/3rdparty/kexisql3/src/where.c +++ b/kexi/3rdparty/kexisql3/src/where.c @@ -114,13 +114,13 @@ struct WhereClause { /* ** An instance of the following structure keeps track of a mapping -** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm. +** between VDBE cursor numbers and bits of the bitmasks in WhereTerm. ** ** The VDBE cursor numbers are small integers contained in ** SrcList_item.iCursor and Expr.iTable fields. For any given WHERE ** clause, the cursor numbers might not begin with 0 and they might ** contain gaps in the numbering sequence. But we want to make maximum -** use of the bits in our bittqmasks. This structure provides a mapping +** use of the bits in our bitmasks. This structure provides a mapping ** from the sparse cursor numbers into consecutive integers beginning ** with 0. ** @@ -146,7 +146,7 @@ struct ExprMaskSet { /* -** Bittqmasks for the operators that indices are able to exploit. An +** Bitmasks for the operators that indices are able to exploit. An ** OR-ed combination of these values can be used when searching for ** terms in the where clause. */ @@ -301,7 +301,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){ ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to ** the VDBE cursor number of the table. This routine just has to ** translate the cursor numbers into bittqmask values and OR all -** the bittqmasks together. +** the bitmasks together. */ static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*); static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*); @@ -458,7 +458,7 @@ static void exprAnalyze(SrcList*, ExprMaskSet*, WhereClause*, int); */ static void exprAnalyzeAll( SrcList *pTabList, /* the FROM clause */ - ExprMaskSet *pMaskSet, /* table tqmasks */ + ExprMaskSet *pMaskSet, /* table masks */ WhereClause *pWC /* the WHERE clause to be analyzed */ ){ int i; @@ -536,7 +536,7 @@ static int isLikeOrGlob( */ static void exprAnalyze( SrcList *pSrc, /* the FROM clause */ - ExprMaskSet *pMaskSet, /* table tqmasks */ + ExprMaskSet *pMaskSet, /* table masks */ WhereClause *pWC, /* the WHERE clause */ int idxTerm /* Index of the term to be analyzed */ ){ @@ -1382,7 +1382,7 @@ WhereInfo *sqlite3WhereBegin( int brk, cont = 0; /* Addresses used during code generation */ Bittqmask notReady; /* Cursors that are not yet positioned */ WhereTerm *pTerm; /* A single term in the WHERE clause */ - ExprMaskSet tqmaskSet; /* The expression tqmask set */ + ExprMaskSet maskSet; /* The expression tqmask set */ WhereClause wc; /* The WHERE clause is divided into these terms */ struct SrcList_item *pTabItem; /* A single entry from pTabList */ WhereLevel *pLevel; /* A single level in the pWInfo list */ @@ -1400,7 +1400,7 @@ WhereInfo *sqlite3WhereBegin( /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. */ - initMaskSet(&tqmaskSet); + initMaskSet(&maskSet); whereClauseInit(&wc, pParse); whereSplit(&wc, pWhere, TK_AND); @@ -1429,9 +1429,9 @@ WhereInfo *sqlite3WhereBegin( ** and work forward so that the added virtual terms are never processed. */ for(i=0; i<pTabList->nSrc; i++){ - createMask(&tqmaskSet, pTabList->a[i].iCursor); + createMask(&maskSet, pTabList->a[i].iCursor); } - exprAnalyzeAll(pTabList, &tqmaskSet, &wc); + exprAnalyzeAll(pTabList, &maskSet, &wc); if( sqlite3_malloc_failed ){ goto whereBeginNoMem; } @@ -1469,7 +1469,7 @@ WhereInfo *sqlite3WhereBegin( Bittqmask m; /* Bittqmask value for j or bestJ */ for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){ - m = getMask(&tqmaskSet, pTabItem->iCursor); + m = getMask(&maskSet, pTabItem->iCursor); if( (m & notReady)==0 ){ if( j==iFrom ) iFrom++; continue; @@ -1506,7 +1506,7 @@ WhereInfo *sqlite3WhereBegin( }else{ pLevel->iIdxCur = -1; } - notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor); + notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor); pLevel->iFrom = bestJ; } TRACE(("*** Optimizer Finished ***\n")); @@ -1854,7 +1854,7 @@ WhereInfo *sqlite3WhereBegin( pLevel->p1 = iCur; pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk); } - notReady &= ~getMask(&tqmaskSet, iCur); + notReady &= ~getMask(&maskSet, iCur); /* Insert code to test every subexpression that can be completely ** computed using the current set of tables. |