Signed-off-by: Robert Wilhelm robert.wilhelm@gmx.net --- This code was added with e56a5907a3b7794a4014114a844726b7377c2395 vbscript: Added a hack for parameterized assignments with one argument. but it is no longer used as of 509044296dde3688cfdaaf02325a1bc8f890bd85 vbscript: Fix parsing call expressions.
--- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 9 ++++----- dlls/vbscript/vbscript.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f5d8a616b9f..2888ea3b546 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -140,7 +140,6 @@ typedef struct _statement_t { typedef struct { statement_t stat; call_expression_t *expr; - BOOL is_strict; } call_statement_t;
typedef struct { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 034baffa4dd..37b14f05e14 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,7 @@ static call_expression_t *new_call_expression(parser_ctx_t*,expression_t*,expres static call_expression_t *make_call_expression(parser_ctx_t*,expression_t*,expression_t*);
static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); -static statement_t *new_call_statement(parser_ctx_t*,unsigned,BOOL,expression_t*); +static statement_t *new_call_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t *); static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); @@ -200,8 +200,8 @@ Statement
SimpleStatement : CallExpression ArgumentList_opt { call_expression_t *call_expr = make_call_expression(ctx, $1, $2); CHECK_ERROR; - $$ = new_call_statement(ctx, @$, FALSE, &call_expr->expr); CHECK_ERROR; }; - | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, TRUE, $2); CHECK_ERROR; } + $$ = new_call_statement(ctx, @$, &call_expr->expr); CHECK_ERROR; }; + | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, $2); CHECK_ERROR; } | CallExpression '=' Expression { $$ = new_assign_statement(ctx, @$, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } @@ -734,7 +734,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return stat; }
-static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_strict, expression_t *expr) +static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, expression_t *expr) { call_expression_t *call_expr = NULL; call_statement_t *stat; @@ -758,7 +758,6 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_ return NULL;
stat->expr = call_expr; - stat->is_strict = is_strict; return &stat->stat; }
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f31bdf2d351..4b57b4b2b93 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -739,7 +739,7 @@ static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTyp DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %d %d %d)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags); return E_NOTIMPL; }
-- 2.28.0
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82658
Your paranoid android.
=== debiant (build log) ===
error: corrupt patch at line 33 Task: Patch failed to apply
=== debiant (build log) ===
error: corrupt patch at line 33 Task: Patch failed to apply