Piotr Caban : msi: Define special types for condition operators, identifiers and expressions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c8d32b69ec467d649ad86b50b14a8cf245630f25
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c8d32b69ec467d649ad86b50b1...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Tue Oct 24 15:01:26 2017 +0200

msi: Define special types for condition operators, identifiers and expressions.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msi/cond.y | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 8b63a50..8bdaf84 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -115,6 +115,9 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
     struct cond_str str;
     LPWSTR    string;
     INT       value;
+    LPWSTR identifier;
+    INT operator;
+    BOOL bool;
 }
 
 %token COND_SPACE COND_EOF
@@ -128,9 +131,11 @@ 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 operator
-%type <string> identifier symbol_s value_s literal
+%type <bool> expression boolean_term boolean_factor
+%type <value> value_i
+%type <string> symbol_s value_s literal
+%type <identifier> identifier
+%type <operator> operator
 
 %%