Piotr Caban : msi: Move condition integer handling into value_i.
Alexandre Julliard
julliard at winehq.org
Wed Oct 25 13:58:43 CDT 2017
Module: wine
Branch: master
Commit: 024c6c1b4b9c674398cd40a1971cbe7d96903ccc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=024c6c1b4b9c674398cd40a1971cbe7d96903ccc
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Oct 24 15:00:58 2017 +0200
msi: Move condition integer handling into value_i.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/cond.y | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 079bbd9..8b63a50 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -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 );
- }
- ;
-
%%
More information about the wine-cvs
mailing list