niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

vbscript: Sub argument has precedence over global const and local dim.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55502
This commit is contained in:
Robert Wilhelm 2023-11-29 21:09:04 +01:00 • committed by Alexandre Julliard
parent 6efee4baf1
commit b13e7ba7a4
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
dlls/vbscript/compile.c
View file

@ -425,6 +425,30 @@ static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, B
return NULL;
}
static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name)
{
unsigned i;
for(i = 0; i < ctx->func->arg_cnt; i++) {
if(!wcsicmp(ctx->func->args[i].name, name))
return TRUE;
}
return FALSE;
}
static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name)
{
dim_decl_t *dim_decl;
for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) {
if(!wcsicmp(dim_decl->name, name))
return TRUE;
}
return FALSE;
}
static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret)
{
unsigned arg_cnt = 0;
@ -479,10 +503,11 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t
if (expr->obj_expr) /* FIXME: we should probably have a dedicated opcode as well */
return compile_member_call_expression(ctx, expr, 0, TRUE);
const_expr = lookup_const_decls(ctx, expr->identifier, TRUE);
if(const_expr)
return compile_expression(ctx, const_expr);
if (!lookup_dim_decls(ctx, expr->identifier) && !lookup_args_name(ctx, expr->identifier)) {
const_expr = lookup_const_decls(ctx, expr->identifier, TRUE);
if(const_expr)
return compile_expression(ctx, const_expr);
}
return push_instr_bstr(ctx, OP_ident, expr->identifier);
}
@ -1104,30 +1129,6 @@ static HRESULT compile_call_statement(compile_ctx_t *ctx, call_statement_t *stat
return S_OK;
}
static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name)
{
dim_decl_t *dim_decl;
for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) {
if(!wcsicmp(dim_decl->name, name))
return TRUE;
}
return FALSE;
}
static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name)
{
unsigned i;
for(i = 0; i < ctx->func->arg_cnt; i++) {
if(!wcsicmp(ctx->func->args[i].name, name))
return TRUE;
}
return FALSE;
}
static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat)
{
dim_decl_t *dim_decl = stat->dim_decls;

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

@ -967,6 +967,19 @@ x = false
Call TestFuncArgVal(x)
Call ok(not x, "x is true after TestFuncArgVal call?")
const c10 = 10
Sub TestParamvsConst(c10)
Call ok( c10 = 42, "precedence between const and parameter wrong!")
End Sub
Call TestParamvsConst(42)
Sub TestDimVsConst
dim c10
c10 = 42
Call ok( c10 = 42, "precedence between const and dim is wrong")
End Sub
Call TestDimVsConst
Function TestFuncMultiArgs(a,b,c,d,e)
Call ok(a=1, "a = " & a)
Call ok(b=2, "b = " & b)