jscript: Use locals map for local variables.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

jscript: Use locals map for local variables.
2e06686e · Jacek Caban · Alexandre Julliard · 2fc67209 · 2e06686e · 2e06686e
Commit 2e06686e authored Aug 04, 2016 by Jacek Caban Committed by Alexandre Julliard Aug 04, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

compile.c dlls/jscript/compile.c +0 -0

engine.c dlls/jscript/engine.c +1 -1

parser.h dlls/jscript/parser.h +1 -0

No files found.
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -617,7 +617,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re
                local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp);
                static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0};

-                if(ref) {
+                if(ref && ref->ref < 0) {
                    ret->type = EXPRVAL_STACK_REF;
                    ret->u.off = scope->frame->arguments_off - ref->ref - 1;
                    return S_OK;

--- a/dlls/jscript/parser.h
+++ b/dlls/jscript/parser.h
@@ -294,6 +294,7 @@ typedef struct _function_expression_t {
    source_elements_t *source_elements;
    const WCHAR *src_str;
    DWORD src_len;
+    unsigned func_id;

    struct _function_expression_t *next; /* for compiler */
 } function_expression_t;