system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 04:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbscript: Clean up lookup_identifier.

Browse source 
Be more explicit about what applies only to non-global code.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-11-05 14:09:20 +01:00 committed by Alexandre Julliard
parent 708c1e865d
commit ae1291cbe0
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
dlls/vbscript/interp.c
View file

@ -109,26 +109,26 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
return S_OK;
}
for(i=0; i < ctx->func->var_cnt; i++) {
if(!wcsicmp(ctx->func->vars[i].name, name)) {
ref->type = REF_VAR;
ref->u.v = ctx->vars+i;
return TRUE;
}
}
for(i=0; i < ctx->func->arg_cnt; i++) {
if(!wcsicmp(ctx->func->args[i].name, name)) {
ref->type = REF_VAR;
ref->u.v = ctx->args+i;
return S_OK;
}
}
if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref))
return S_OK;
if(ctx->func->type != FUNC_GLOBAL) {
for(i=0; i < ctx->func->var_cnt; i++) {
if(!wcsicmp(ctx->func->vars[i].name, name)) {
ref->type = REF_VAR;
ref->u.v = ctx->vars+i;
return TRUE;
}
}
for(i=0; i < ctx->func->arg_cnt; i++) {
if(!wcsicmp(ctx->func->args[i].name, name)) {
ref->type = REF_VAR;
ref->u.v = ctx->args+i;
return S_OK;
}
}
if(lookup_dynamic_vars(ctx->dynamic_vars, name, ref))
return S_OK;
if(ctx->vbthis) {
/* FIXME: Bind such identifier while generating bytecode. */
for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) {
@ -159,7 +159,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
}
}
if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref))
if(lookup_dynamic_vars(ctx->script->global_vars, name, ref))
return S_OK;
for(i = 0; i < ctx->script->global_funcs_cnt; i++) {