Skip to content

W
wine-winehq
Commit 024c6c1b authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msi: Move condition integer handling into value_i.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 85527dbd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 15 deletions
dlls/msi/cond.y
View file @ 024c6c1b
......@@ -129,7 +129,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
%nonassoc COND_ERROR COND_EOF
%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
%%
......@@ -293,9 +293,14 @@ literal:
;
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
{
......@@ -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 );
}
;
%%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment