Alexandre Julliard : vbscript: Use bison directives instead of defines to specify extra lexer parameters.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu Aug  1 12:00:23 2013 +0200

vbscript: Use bison directives instead of defines to specify extra lexer parameters.

---

dlls/vbscript/parser.y |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 4b380ef..3c54fd8 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -25,10 +25,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(vbscript);

-#define YYLEX_PARAM ctx
-#define YYPARSE_PARAM ctx
-
-static int parser_error(const char*);
+static int parser_error(parser_ctx_t *,const char*);

static void parse_complete(parser_ctx_t*,BOOL);

@@ -82,7 +79,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0};

%}

-%pure_parser
+%lex-param { parser_ctx_t *ctx }
+%parse-param { parser_ctx_t *ctx }
+%pure-parser
 %start Program

%union {
@@ -426,7 +425,7 @@ Identifier
     | tPROPERTY      { $$ = propertyW; }
 %%

-static int parser_error(const char *str)
+static int parser_error(parser_ctx_t *ctx, const char *str)
 {
     return 0;
 }