Jacek Caban : jscript: Use BOOL instead of VARIANT_BOOL in lexer.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Sep 17 15:20:37 2012 +0200

jscript: Use BOOL instead of VARIANT_BOOL in lexer.

---

dlls/jscript/engine.h |    4 ++--
 dlls/jscript/lex.c    |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index 361b786..c3f349b 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -262,7 +262,7 @@ typedef struct {
     union {
         double dval;
         const WCHAR *wstr;
-        VARIANT_BOOL bval;
+        BOOL bval;
         struct {
             const WCHAR *str;
             DWORD str_len;
@@ -272,7 +272,7 @@ typedef struct {
 } literal_t;

literal_t *parse_regexp(parser_ctx_t*) DECLSPEC_HIDDEN;
-literal_t *new_boolean_literal(parser_ctx_t*,VARIANT_BOOL) DECLSPEC_HIDDEN;
+literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN;

typedef struct _variable_declaration_t {
     const WCHAR *identifier;
diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index 4c2cc6b..8823a30 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -380,7 +380,7 @@ static literal_t *new_double_literal(parser_ctx_t *ctx, DOUBLE d)
     return ret;
 }

-literal_t *new_boolean_literal(parser_ctx_t *ctx, VARIANT_BOOL bval)
+literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval)
 {
     literal_t *ret = parser_alloc(ctx, sizeof(literal_t));

@@ -749,7 +749,7 @@ static int next_token(parser_ctx_t *ctx, void *lval)
 struct _cc_var_t {
     BOOL is_num;
     union {
-        VARIANT_BOOL b;
+        BOOL b;
         DOUBLE n;
     } u;
     struct _cc_var_t *next;
@@ -822,7 +822,7 @@ static int init_cc(parser_ctx_t *ctx)

cc->vars = NULL;
     v.is_num = FALSE;
-    v.u.b = VARIANT_TRUE;
+    v.u.b = TRUE;
     if(!add_cc_var(cc, _jscriptW, &v)
        || !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v)
        || !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) {