system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 09:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

vbscript: Added Exit Function statement implementation.

Browse source
This commit is contained in:
Jacek Caban 2011-09-14 12:58:10 +02:00 committed by Alexandre Julliard
parent 78957118fb
commit 1cefcdb6b7
4 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/vbscript/compile.c
View file

@ -39,6 +39,7 @@ typedef struct {
unsigned labels_cnt;
unsigned sub_end_label;
unsigned func_end_label;
dim_decl_t *dim_decls;
dynamic_var_t *global_vars;
@ -555,6 +556,16 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx)
return push_instr_addr(ctx, OP_jmp, ctx->sub_end_label);
}
static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx)
{
if(ctx->func_end_label == -1) {
FIXME("Exit Function outside Function?\n");
return E_FAIL;
}
return push_instr_addr(ctx, OP_jmp, ctx->func_end_label);
}
static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat)
{
HRESULT hres;
@ -570,6 +581,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat)
case STAT_DIM:
hres = compile_dim_statement(ctx, (dim_statement_t*)stat);
break;
case STAT_EXITFUNC:
hres = compile_exitfunc_statement(ctx);
break;
case STAT_EXITSUB:
hres = compile_exitsub_statement(ctx);
break;
@ -614,14 +628,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f
func->code_off = ctx->instr_cnt;
ctx->sub_end_label = -1;
ctx->func_end_label = -1;
switch(func->type) {
case FUNC_FUNCTION:
ctx->func_end_label = alloc_label(ctx);
if(ctx->func_end_label == -1)
return E_OUTOFMEMORY; /* FIXME ! */
break;
case FUNC_SUB:
ctx->sub_end_label = alloc_label(ctx);
if(ctx->sub_end_label == -1)
return E_OUTOFMEMORY;
break;
case FUNC_FUNCTION: /* FIXME */
case FUNC_GLOBAL:
break;
}
@ -635,6 +654,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f
if(ctx->sub_end_label != -1)
label_set_addr(ctx, ctx->sub_end_label);
if(ctx->func_end_label != -1)
label_set_addr(ctx, ctx->func_end_label);
if(push_instr(ctx, OP_ret) == -1)
return E_OUTOFMEMORY;

1
dlls/vbscript/parse.h
View file

@ -86,6 +86,7 @@ typedef enum {
STAT_ASSIGN,
STAT_CALL,
STAT_DIM,
STAT_EXITFUNC,
STAT_EXITSUB,
STAT_FUNC,
STAT_IF

1
dlls/vbscript/parser.y
View file

@ -139,6 +139,7 @@ Statement
| tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; }
| IfStatement { $$ = $1; }
| FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; }
| tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; }
| tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; }
MemberExpression

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

@ -304,4 +304,13 @@ y = true
Call TestFuncLocalVal
Call ok(x, "global x is not true?")
Function TestFuncExit(ByRef a)
If a Then
Exit Function
End If
Call ok(false, "Exit Function not called?")
End Function
Call TestFuncExit(true)
reportSuccess()