diff options
| author | drh <drh@noemail.net> | 2009-05-27 10:31:29 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-05-27 10:31:29 +0000 |
| commit | b7916a78ff7708161b6e2de54af5aea85a07c543 (patch) | |
| tree | 0699a42ca40c038b563d4fadd6bfeb2080942de0 /src/tokenize.c | |
| parent | 38a2c01b09b494030bd3f62743119331522d1e04 (diff) | |
| download | sqlite-b7916a78ff7708161b6e2de54af5aea85a07c543.tar.gz sqlite-b7916a78ff7708161b6e2de54af5aea85a07c543.zip | |
Simplifications to the Expr object: Remove Expr.span completely and convert
Expr.token into a char* Expr.zToken. Also simplify the Token object by
removing the Token.dyn and Token.quoted fields. (CVS 6681)
FossilOrigin-Name: 7cb1c3ba0759539cb035978fdaff6316775986f3
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index a933de1b9..3e6c98c97 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -15,7 +15,7 @@ ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** -** $Id: tokenize.c,v 1.156 2009/05/01 21:13:37 drh Exp $ +** $Id: tokenize.c,v 1.157 2009/05/27 10:31:29 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -404,7 +404,6 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ db->mallocFailed = 1; return SQLITE_NOMEM; } - assert( pParse->sLastToken.dyn==0 ); assert( pParse->pNewTable==0 ); assert( pParse->pNewTrigger==0 ); assert( pParse->nVar==0 ); @@ -413,12 +412,9 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ assert( pParse->apVarExpr==0 ); enableLookaside = db->lookaside.bEnabled; if( db->lookaside.pStart ) db->lookaside.bEnabled = 1; - pParse->sLastToken.quoted = 1; while( !db->mallocFailed && zSql[i]!=0 ){ assert( i>=0 ); - pParse->sLastToken.z = (u8*)&zSql[i]; - assert( pParse->sLastToken.dyn==0 ); - assert( pParse->sLastToken.quoted ); + pParse->sLastToken.z = &zSql[i]; pParse->sLastToken.n = sqlite3GetToken((unsigned char*)&zSql[i],&tokenType); i += pParse->sLastToken.n; if( i>mxSqlLen ){ |