diff options
| author | drh <drh@noemail.net> | 2014-07-24 16:54:28 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-07-24 16:54:28 +0000 |
| commit | 2bd2c29a955a2d459b2b300125eda1d79b070e64 (patch) | |
| tree | 3dac35daf7fb3c5a48c4e71900dfcff7b4a95311 /src/tokenize.c | |
| parent | 6614181610e4c40e44484a1c7b14b253d512ad77 (diff) | |
| parent | ba5b09319e2f79707bcc55a84a5f059ea0949334 (diff) | |
| download | sqlite-2bd2c29a955a2d459b2b300125eda1d79b070e64.tar.gz sqlite-2bd2c29a955a2d459b2b300125eda1d79b070e64.zip | |
Merge all recent trunk changes into the threads branch.
FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index 87553e25b..4017c3b81 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -270,6 +270,12 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){ testcase( z[0]=='6' ); testcase( z[0]=='7' ); testcase( z[0]=='8' ); testcase( z[0]=='9' ); *tokenType = TK_INTEGER; +#ifndef SQLITE_OMIT_HEX_INTEGER + if( z[0]=='0' && (z[1]=='x' || z[1]=='X') && sqlite3Isxdigit(z[2]) ){ + for(i=3; sqlite3Isxdigit(z[i]); i++){} + return i; + } +#endif for(i=0; sqlite3Isdigit(z[i]); i++){} #ifndef SQLITE_OMIT_FLOATING_POINT if( z[i]=='.' ){ |