SQLite: Check-in [18f2076a]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	A minor simplification to the tokenizer. (CVS 6771)
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	18f2076ac21dd0ab343a79461837f5591f9d4d87
User & Date:	drh 2009-06-17 01:17:13

Context

2009-06-17
11:13		Fix for #3918. Also, fix the TRACE macros in balance_nonroot(). (CVS 6772) (check-in: 368e44ec user: danielk1977 tags: trunk)
01:17		A minor simplification to the tokenizer. (CVS 6771) (check-in: 18f2076a user: drh tags: trunk)
00:35		Changes to prepare.c and callback.c to promote better test coverage. (CVS 6770) (check-in: 08cca219 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/tokenize.c.

    11     11   *************************************************************************
    12     12   ** An tokenizer for SQL
    13     13   **
    14     14   ** This file contains C code that splits an SQL input string up into
    15     15   ** individual tokens and sends those tokens one-by-one over to the
    16     16   ** parser for analysis.
    17     17   **
    18         -** $Id: tokenize.c,v 1.160 2009/06/12 11:42:12 drh Exp $
           18  +** $Id: tokenize.c,v 1.161 2009/06/17 01:17:13 drh Exp $
    19     19   */
    20     20   #include "sqliteInt.h"
    21     21   #include <stdlib.h>
    22     22   
    23     23   /*
    24     24   ** The charMap() macro maps alphabetic characters into their
    25     25   ** lower-case ASCII equivalent.  On ASCII machines, this is just
................................................................................
   519    519     sqlite3DbFree(db, pParse->apVarExpr);
   520    520     sqlite3DbFree(db, pParse->aAlias);
   521    521     while( pParse->pZombieTab ){
   522    522       Table *p = pParse->pZombieTab;
   523    523       pParse->pZombieTab = p->pNextZombie;
   524    524       sqlite3DeleteTable(p);
   525    525     }
   526         -  if( nErr>0 && (pParse->rc==SQLITE_OK || pParse->rc==SQLITE_DONE) ){
          526  +  if( nErr>0 && pParse->rc==SQLITE_OK ){
   527    527       pParse->rc = SQLITE_ERROR;
   528    528     }
   529    529     return nErr;
   530    530   }