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

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Sep 20 14:58:53 2011 +0200

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

---

 dlls/vbscript/lex.c          |    1 +
 dlls/vbscript/parser.y       |   26 ++++++++++++++++++++++++--
 dlls/vbscript/tests/lang.vbs |    5 +++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c
index 394a24d..8bad383 100644
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -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 '=':
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index d3ed732..2d80c40 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -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;
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 922fc6a..2966453 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -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