ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Added support for ':' as statement separator.

Browse Source
This commit is contained in:
Jacek Caban 2011-09-20 14:58:53 +02:00 committed by Alexandre Julliard
parent 13fef511b2
commit d0ae4c47a9
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/vbscript/lex.c
View File

@ -333,6 +333,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx)
else
ctx->ptr = ctx->end;
return tNL;
case ':':
case ')':
case ',':
case '=':

26
dlls/vbscript/parser.y
View File

@ -66,6 +66,8 @@ 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*);
static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,unsigned);
static statement_t *link_statements(statement_t*,statement_t*);
#define STORAGE_IS_PRIVATE 1
#define STORAGE_IS_DEFAULT 2
@ -109,7 +111,7 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u
%token <lng> tLong tShort
%token <dbl> tDouble
%type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt
%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt
%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression
%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression
%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression
@ -143,12 +145,19 @@ StatementsNl_opt
StatementsNl
: StatementNl { $$ = $1; }
| StatementNl StatementsNl { $1->next = $2; $$ = $1; }
| StatementNl StatementsNl { $$ = link_statements($1, $2); }
StatementNl
: Statement tNL { $$ = $1; }
Statement
: ':' { $$ = NULL; }
| ':' Statement { $$ = $2; }
| SimpleStatement { $$ = $1; }
| SimpleStatement ':' Statement { $1->next = $3; $$ = $1; }
| SimpleStatement ':' { $$ = $1; }
SimpleStatement
: MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; }
| tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; }
| MemberExpression Arguments_opt '=' Expression
@ -366,6 +375,9 @@ static int parser_error(const char *str)
static void source_add_statement(parser_ctx_t *ctx, statement_t *stat)
{
if(!stat)
return;
if(ctx->stats) {
ctx->stats_tail->next = stat;
ctx->stats_tail = stat;
@ -752,6 +764,16 @@ static class_decl_t *add_variant_prop(parser_ctx_t *ctx, class_decl_t *class_dec
return class_decl;
}
static statement_t *link_statements(statement_t *head, statement_t *tail)
{
statement_t *iter;
for(iter = head; iter->next; iter = iter->next);
iter->next = tail;
return head;
}
void *parser_alloc(parser_ctx_t *ctx, size_t size)
{
void *ret;

5
dlls/vbscript/tests/lang.vbs
View File

@ -608,6 +608,11 @@ funcCalled = ""
Set obj = Nothing
Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled)
x = "following ':' is correct syntax" :
x = "following ':' is correct syntax" :: :
:: x = "also correct syntax"
:
Set obj = new EmptyClass
Set x = obj
Set y = new EmptyClass