[PATCH 1/4] msi: Move condition integer handling into value_i
Piotr Caban <[email protected]>
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <[email protected]> |
Signed-off-by: Piotr Caban <[email protected]> --- dlls/msi/cond.y | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
0001-msi-Move-condition-integer-handling-into-value_i.txt
(text/x-patch, 1.1 KB)
diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 079bbd9703..8b63a5064a 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 );
- }
- ;
-
%%