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

msi: Move condition integer handling into value_i. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2017-10-24 15:00:58 +02:00 committed by Alexandre Julliard
parent 85527dbdf3
commit 024c6c1b4b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/msi/cond.y
View File

@ -129,7 +129,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
%nonassoc COND_ERROR COND_EOF %nonassoc COND_ERROR COND_EOF
%type <value> expression boolean_term boolean_factor %type <value> expression boolean_term boolean_factor
%type <value> value_i integer operator %type <value> value_i operator
%type <string> identifier symbol_s value_s literal %type <string> identifier symbol_s value_s literal
%% %%
@ -293,9 +293,14 @@ literal:
; ;
value_i: value_i:
integer COND_NUMBER
{ {
$$ = $1; COND_input* cond = (COND_input*) info;
LPWSTR szNum = COND_GetString( cond, &$1 );
if( !szNum )
YYABORT;
$$ = atoiW( szNum );
cond_free( szNum );
} }
| COND_DOLLARS identifier | COND_DOLLARS identifier
{ {
@ -382,18 +387,6 @@ identifier:
} }
; ;
integer:
COND_NUMBER
{
COND_input* cond = (COND_input*) info;
LPWSTR szNum = COND_GetString( cond, &$1 );
if( !szNum )
YYABORT;
$$ = atoiW( szNum );
cond_free( szNum );
}
;
%% %%