ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve number parsing and avoid unicode.h.

This commit is contained in:
Mike McCormack 2005-05-31 09:30:01 +00:00 committed by Alexandre Julliard
parent 883413faf6
commit b15c264de4
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/msi/sql.y
View File

@ -32,7 +32,6 @@
#include "query.h" #include "query.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#define YYLEX_PARAM info #define YYLEX_PARAM info
#define YYPARSE_PARAM info #define YYPARSE_PARAM info
@ -61,7 +60,7 @@ static BOOL SQL_MarkPrimaryKeys( column_info *cols, column_info *keys);
static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct expr *r ); static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct expr *r );
static struct expr * EXPR_column( void *info, column_info *column ); static struct expr * EXPR_column( void *info, column_info *column );
static struct expr * EXPR_ival( void *info, struct sql_str *, int sign ); static struct expr * EXPR_ival( void *info, int val );
static struct expr * EXPR_sval( void *info, struct sql_str * ); static struct expr * EXPR_sval( void *info, struct sql_str * );
static struct expr * EXPR_wildcard( void *info ); static struct expr * EXPR_wildcard( void *info );
@ -77,6 +76,7 @@ static struct expr * EXPR_wildcard( void *info );
MSIVIEW *query; MSIVIEW *query;
struct expr *expr; struct expr *expr;
USHORT column_type; USHORT column_type;
int integer;
} }
%token TK_ABORT TK_AFTER TK_AGG_FUNCTION TK_ALL TK_AND TK_AS TK_ASC %token TK_ABORT TK_AFTER TK_AGG_FUNCTION TK_ALL TK_AND TK_AS TK_ASC
@ -130,6 +130,7 @@ static struct expr * EXPR_wildcard( void *info );
%type <query> oneupdate onedelete oneselect onequery onecreate oneinsert %type <query> oneupdate onedelete oneselect onequery onecreate oneinsert
%type <expr> expr val column_val const_val %type <expr> expr val column_val const_val
%type <column_type> column_type data_type data_type_l data_count %type <column_type> column_type data_type data_type_l data_count
%type <integer> number
%% %%
@ -316,13 +317,11 @@ data_type:
; ;
data_count: data_count:
TK_INTEGER number
{ {
SQL_input* sql = (SQL_input*) info; if( ( $1 > 255 ) || ( $1 < 0 ) )
int val = SQL_getint(sql);
if( ( val > 255 ) || ( val < 0 ) )
YYABORT; YYABORT;
$$ = val; $$ = $1;
} }
; ;
@ -529,15 +528,15 @@ column_assignment:
; ;
const_val: const_val:
TK_INTEGER number
{ {
$$ = EXPR_ival( info, &$1, 1 ); $$ = EXPR_ival( info, $1 );
if( !$$ ) if( !$$ )
YYABORT; YYABORT;
} }
| TK_MINUS TK_INTEGER | TK_MINUS number
{ {
$$ = EXPR_ival( info, &$2, -1 ); $$ = EXPR_ival( info, -$2 );
if( !$$ ) if( !$$ )
YYABORT; YYABORT;
} }
@ -595,6 +594,13 @@ id:
} }
; ;
number:
TK_INTEGER
{
$$ = SQL_getint( info );
}
;
%% %%
static void *parser_alloc( void *info, unsigned int sz ) static void *parser_alloc( void *info, unsigned int sz )
@ -675,8 +681,19 @@ INT SQL_getint( void *info )
{ {
SQL_input* sql = (SQL_input*) info; SQL_input* sql = (SQL_input*) info;
LPCWSTR p = &sql->command[sql->n]; LPCWSTR p = &sql->command[sql->n];
INT i, r = 0;
return atoiW( p ); for( i=0; i<sql->len; i++ )
{
if( '0' > p[i] || '9' < p[i] )
{
ERR("should only be numbers here!\n");
break;
}
r = (p[i]-'0') + r*10;
}
return r;
} }
int SQL_error( const char *str ) int SQL_error( const char *str )
@ -718,13 +735,13 @@ static struct expr * EXPR_column( void *info, column_info *column )
return e; return e;
} }
static struct expr * EXPR_ival( void *info, struct sql_str *str, int sign ) static struct expr * EXPR_ival( void *info, int val )
{ {
struct expr *e = parser_alloc( info, sizeof *e ); struct expr *e = parser_alloc( info, sizeof *e );
if( e ) if( e )
{ {
e->type = EXPR_IVAL; e->type = EXPR_IVAL;
e->u.ival = atoiW( str->data ) * sign; e->u.ival = val;
} }
return e; return e;
} }