system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbscript: Added do while..loop statement implementation.

Browse source
This commit is contained in:
Jacek Caban 2011-09-16 13:30:09 +02:00 committed by Alexandre Julliard
parent 3d34925802
commit 1f5c56d1a8
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/vbscript/compile.c
View file

@ -661,6 +661,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat)
hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK;
break;
case STAT_WHILE:
case STAT_WHILELOOP:
hres = compile_while_statement(ctx, (while_statement_t*)stat);
break;
default:

3
dlls/vbscript/parse.h
View file

@ -100,7 +100,8 @@ typedef enum {
STAT_IF,
STAT_SET,
STAT_STOP,
STAT_WHILE
STAT_WHILE,
STAT_WHILELOOP
} statement_type_t;
typedef struct _statement_t {

2
dlls/vbscript/parser.y
View file

@ -156,6 +156,8 @@ Statement
| IfStatement { $$ = $1; }
| tWHILE Expression tNL StatementsNl_opt tWEND
{ $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; }
| tDO tWHILE Expression tNL StatementsNl_opt tLOOP
{ $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; }
| FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; }
| tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; }
| tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; }

13
dlls/vbscript/tests/lang.vbs
View file

@ -212,6 +212,19 @@ call ok((x and y), "x or y is false after while")
while false
wend
x = false
y = false
do while not (x and y)
if x then
y = true
end if
x = true
loop
call ok((x and y), "x or y is false after while")
do while false
loop
if false then
Sub testsub
x = true