simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

more tweaks on sqlite_is_number

Browse source
This commit is contained in:
Kenichi Ishigaki 2012-04-28 01:03:11 +00:00
parent d19cc469d8
commit e49ab2c08b
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dbdimp.c
View file

@ -175,7 +175,8 @@ sqlite_is_number(pTHX_ const char *v, int sql_type)
int neg; int neg;
int digit = 0; int digit = 0;
int precision = 0; int precision = 0;
int has_plus = 0; bool has_plus = TRUE;
bool maybe_int = TRUE;
char format[10]; char format[10];
if (sql_type != SQLITE_NULL) { if (sql_type != SQLITE_NULL) {
@ -183,12 +184,12 @@ sqlite_is_number(pTHX_ const char *v, int sql_type)
} }
if (*z == '-') { neg = 1; z++; d++; } if (*z == '-') { neg = 1; z++; d++; }
else if (*z == '+') { neg = 0; z++; d++; has_plus = 1; } else if (*z == '+') { neg = 0; z++; d++; has_plus = TRUE; }
else { neg = 0; } else { neg = 0; }
if (!isdigit(*z)) return 0; if (!isdigit(*z)) return 0;
while (isdigit(*z)) { digit++; z++; } while (isdigit(*z)) { digit++; z++; }
#if defined(USE_64_BIT_INT) #if defined(USE_64_BIT_INT)
if (digit > 19) return 0; /* too large for i64 */ if (digit > 19) maybe_int = FALSE; /* too large for i64 */
if (digit == 19) { if (digit == 19) {
int c; int c;
char tmp[22]; char tmp[22];
@ -197,10 +198,10 @@ sqlite_is_number(pTHX_ const char *v, int sql_type)
if (c == 0) { if (c == 0) {
c = tmp[18] - '7' - neg; c = tmp[18] - '7' - neg;
} }
if (c > 0) return 0; if (c > 0) maybe_int = FALSE;
} }
#else #else
if (digit > 10) return 0; /* too large for i32 */ if (digit > 10) maybe_int = FALSE; /* too large for i32 */
if (digit == 10) { if (digit == 10) {
int c; int c;
char tmp[14]; char tmp[14];
@ -209,27 +210,32 @@ sqlite_is_number(pTHX_ const char *v, int sql_type)
if (c == 0) { if (c == 0) {
c = tmp[9] - '7' - neg; c = tmp[9] - '7' - neg;
} }
if (c > 0) return 0; if (c > 0) maybe_int = FALSE;
} }
#endif #endif
if (*z == '.') { if (*z == '.') {
maybe_int = FALSE;
z++; z++;
if (!isdigit(*z)) return 0; if (!isdigit(*z)) return 0;
while (isdigit(*z)) { precision++; z++; } while (isdigit(*z)) { precision++; z++; }
} }
if (*z == 'e' || *z == 'E') { if (*z == 'e' || *z == 'E') {
maybe_int = FALSE;
z++; z++;
if (*z == '+' || *z == '-') { z++; } if (*z == '+' || *z == '-') { z++; }
if (!isdigit(*z)) return 0; if (!isdigit(*z)) return 0;
while (isdigit(*z)) { z++; } while (isdigit(*z)) { z++; }
} }
if (*z && !isdigit(*z)) return 0;
if (maybe_int || sql_type == SQLITE_INTEGER) {
#if defined(USE_64_BIT_INT) #if defined(USE_64_BIT_INT)
if (strEQ(form((has_plus ? "+%lli" : "%lli"), atoll(v)), v)) return 1; if (strEQ(form((has_plus ? "+%lli" : "%lli"), atoll(v)), v)) return 1;
#else #else
if (strEQ(form((has_plus ? "+%i" : "%i"), atoi(v)), v)) return 1; if (strEQ(form((has_plus ? "+%i" : "%i"), atoi(v)), v)) return 1;
#endif #endif
if (precision || sql_type == SQLITE_FLOAT) { }
if (sql_type != SQLITE_INTEGER) {
sprintf(format, (has_plus ? "+%%.%df" : "%%.%df"), precision); sprintf(format, (has_plus ? "+%%.%df" : "%%.%df"), precision);
if (strEQ(form(format, atof(v)), v)) return 2; if (strEQ(form(format, atof(v)), v)) return 2;
} }