diff options
author | drh <drh@noemail.net> | 2014-07-24 12:19:41 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-07-24 12:19:41 +0000 |
commit | c4747f231496c0169c1304bed83c9cc690193ef5 (patch) | |
tree | 6a528fb4fae701d04d86a03ef856fe392fff0955 /src/expr.c | |
parent | 6976c2123b6498e6e5744a8be4caa4fa62de8906 (diff) | |
parent | 3b9fab1cb9239e1ed0c17d695a45d467c826aa80 (diff) | |
download | sqlite-c4747f231496c0169c1304bed83c9cc690193ef5.tar.gz sqlite-c4747f231496c0169c1304bed83c9cc690193ef5.zip |
Add support for hexadecimal integer literals in the parser.
FossilOrigin-Name: f8f79f28785db716b10c3bc9d6652b98253fd125
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index 803d93f30..72286dfdf 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2075,7 +2075,7 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){ i64 value; const char *z = pExpr->u.zToken; assert( z!=0 ); - c = sqlite3Atoi64(z, &value, sqlite3Strlen30(z), SQLITE_UTF8); + c = sqlite3DecOrHexToI64(z, &value); if( c==0 || (c==2 && negFlag) ){ char *zV; if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; } @@ -2085,7 +2085,14 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){ #ifdef SQLITE_OMIT_FLOATING_POINT sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z); #else - codeReal(v, z, negFlag, iMem); +#ifndef SQLITE_OMIT_HEX_INTEGER + if( sqlite3_strnicmp(z,"0x",2)==0 ){ + sqlite3ErrorMsg(pParse, "hex literal too big: %s", z); + }else +#endif + { + codeReal(v, z, negFlag, iMem); + } #endif } } |