Jacek Caban : vbscript: Added parser support for equality expression.
Alexandre Julliard
julliard at winehq.org
Fri Sep 9 10:56:47 CDT 2011
Module: wine
Branch: master
Commit: 82b7651841088c3a44b60a182490fd2a3976229f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7651841088c3a44b60a182490fd2a3976229f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Sep 9 14:48:13 2011 +0200
vbscript: Added parser support for equality expression.
---
dlls/vbscript/parse.h | 7 +++++++
dlls/vbscript/parser.y | 26 ++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h
index 0e1b4d1..607bdec 100644
--- a/dlls/vbscript/parse.h
+++ b/dlls/vbscript/parse.h
@@ -18,6 +18,7 @@
typedef enum {
EXPR_BOOL,
+ EXPR_EQUAL,
EXPR_MEMBER,
EXPR_NOT,
EXPR_STRING
@@ -45,6 +46,12 @@ typedef struct {
typedef struct {
expression_t expr;
+ expression_t *left;
+ expression_t *right;
+} binary_expression_t;
+
+typedef struct {
+ expression_t expr;
expression_t *obj_expr;
const WCHAR *identifier;
expression_t *args;
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index a743b97..7703402 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -38,6 +38,7 @@ static void source_add_statement(parser_ctx_t*,statement_t*);
static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL);
static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*);
static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*);
+static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*);
static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*);
@@ -74,7 +75,8 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*);
%token <string> tIdentifier tString
%type <statement> Statement StatementNl
-%type <expression> Expression LiteralExpression PrimaryExpression
+%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression
+%type <expression> ConcatExpression
%type <expression> NotExpression
%type <member> MemberExpression
%type <expression> Arguments_opt ArgumentList_opt ArgumentList
@@ -124,9 +126,16 @@ Expression
: NotExpression { $$ = $1; }
NotExpression
+ : EqualityExpression { $$ = $1; }
+ | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; }
+
+EqualityExpression
+ : ConcatExpression { $$ = $1; }
+ | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; }
+
+ConcatExpression
: LiteralExpression /* FIXME */ { $$ = $1; }
| PrimaryExpression /* FIXME */ { $$ = $1; }
- | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; }
LiteralExpression
: tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; }
@@ -208,6 +217,19 @@ static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t t
return &expr->expr;
}
+static expression_t *new_binary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *left, expression_t *right)
+{
+ binary_expression_t *expr;
+
+ expr = new_expression(ctx, type, sizeof(*expr));
+ if(!expr)
+ return NULL;
+
+ expr->left = left;
+ expr->right = right;
+ return &expr->expr;
+}
+
static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *obj_expr, const WCHAR *identifier)
{
member_expression_t *expr;
More information about the wine-cvs
mailing list