Jacek Caban : vbscript: Added const statement parser implementation.
Alexandre Julliard
julliard at winehq.org
Wed Sep 21 13:35:15 CDT 2011
Module: wine
Branch: master
Commit: eb5e97a67f61b24e3b5f92bdb52923804b4d2c7d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5e97a67f61b24e3b5f92bdb52923804b4d2c7d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 21 14:03:18 2011 +0200
vbscript: Added const statement parser implementation.
---
dlls/vbscript/lex.c | 2 ++
dlls/vbscript/parse.h | 12 ++++++++++++
dlls/vbscript/parser.y | 41 +++++++++++++++++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c
index e0a9418..f42d2fd 100644
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -31,6 +31,7 @@ static const WCHAR byrefW[] = {'b','y','r','e','f',0};
static const WCHAR byvalW[] = {'b','y','v','a','l',0};
static const WCHAR callW[] = {'c','a','l','l',0};
static const WCHAR classW[] = {'c','l','a','s','s',0};
+static const WCHAR constW[] = {'c','o','n','s','t',0};
static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0};
static const WCHAR dimW[] = {'d','i','m',0};
static const WCHAR doW[] = {'d','o',0};
@@ -85,6 +86,7 @@ static const struct {
{byvalW, tBYVAL},
{callW, tCALL},
{classW, tCLASS},
+ {constW, tCONST},
{defaultW, tDEFAULT},
{dimW, tDIM},
{doW, tDO},
diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h
index 976de53..8e4be57 100644
--- a/dlls/vbscript/parse.h
+++ b/dlls/vbscript/parse.h
@@ -98,6 +98,7 @@ typedef struct {
typedef enum {
STAT_ASSIGN,
STAT_CALL,
+ STAT_CONST,
STAT_DIM,
STAT_DOUNTIL,
STAT_DOWHILE,
@@ -200,6 +201,17 @@ typedef struct {
BOOL resume_next;
} onerror_statement_t;
+typedef struct _const_decl_t {
+ const WCHAR *name;
+ expression_t *value_expr;
+ struct _const_decl_t *next;
+} const_decl_t;
+
+typedef struct {
+ statement_t stat;
+ const_decl_t *decls;
+} const_statement_t;
+
typedef struct {
const WCHAR *code;
const WCHAR *ptr;
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 728bd92..8435e92 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -25,7 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
-
#define YYLEX_PARAM ctx
#define YYPARSE_PARAM ctx
@@ -56,11 +55,13 @@ static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expressio
static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*);
static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*);
static statement_t *new_onerror_statement(parser_ctx_t*,BOOL);
+static statement_t *new_const_statement(parser_ctx_t*,const_decl_t*);
static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*);
static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*);
static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*);
static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL);
+static const_decl_t *new_const_decl(parser_ctx_t*,const WCHAR*,expression_t*);
static class_decl_t *new_class_decl(parser_ctx_t*);
static class_decl_t *add_class_function(parser_ctx_t*,class_decl_t*,function_decl_t*);
@@ -88,6 +89,7 @@ static statement_t *link_statements(statement_t*,statement_t*);
function_decl_t *func_decl;
arg_decl_t *arg_decl;
class_decl_t *class_decl;
+ const_decl_t *const_decl;
unsigned uint;
LONG lng;
BOOL bool;
@@ -98,7 +100,7 @@ static statement_t *link_statements(statement_t*,statement_t*);
%token tTRUE tFALSE
%token tNOT tAND tOR tXOR tEQV tIMP tNEQ
%token tIS tLTEQ tGTEQ tMOD
-%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET
+%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST
%token tIF tELSE tELSEIF tEND tTHEN tEXIT
%token tWHILE tWEND tDO tLOOP tUNTIL
%token tBYREF tBYVAL
@@ -124,6 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*);
%type <class_decl> ClassDeclaration ClassBody
%type <uint> Storage Storage_opt
%type <dim_decl> DimDeclList
+%type <const_decl> ConstDecl ConstDeclList
%%
@@ -182,6 +185,7 @@ SimpleStatement
| tSTOP { $$ = new_statement(ctx, STAT_STOP, 0); CHECK_ERROR; }
| tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; }
| tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; }
+ | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; }
MemberExpression
: tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; }
@@ -191,6 +195,13 @@ DimDeclList /* FIXME: Support arrays */
: tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; }
| tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; }
+ConstDeclList
+ : ConstDecl { $$ = $1; }
+ | ConstDecl ',' ConstDeclList { $1->next = $3; $$ = $1; }
+
+ConstDecl
+ : tIdentifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; }
+
DoType
: tWHILE { $$ = TRUE; }
| tUNTIL { $$ = FALSE; }
@@ -766,6 +777,32 @@ static class_decl_t *add_variant_prop(parser_ctx_t *ctx, class_decl_t *class_dec
return class_decl;
}
+static const_decl_t *new_const_decl(parser_ctx_t *ctx, const WCHAR *name, expression_t *expr)
+{
+ const_decl_t *decl;
+
+ decl = parser_alloc(ctx, sizeof(*decl));
+ if(!decl)
+ return NULL;
+
+ decl->name = name;
+ decl->value_expr = expr;
+ decl->next = NULL;
+ return decl;
+}
+
+static statement_t *new_const_statement(parser_ctx_t *ctx, const_decl_t *decls)
+{
+ const_statement_t *stat;
+
+ stat = new_statement(ctx, STAT_CONST, sizeof(*stat));
+ if(!stat)
+ return NULL;
+
+ stat->decls = decls;
+ return &stat->stat;
+}
+
static statement_t *link_statements(statement_t *head, statement_t *tail)
{
statement_t *iter;
More information about the wine-cvs
mailing list