Allowing variables and functions to be redeclared.

diff --git a/njs/njs_function.c b/njs/njs_function.c
index b9fcd64bfc9b219ed468b3e55c9193962a0e53bb..11cc42c5a6935742251993acc97b21f00a9f9fd2 100644 (file)
--- a/njs/njs_function.c
+++ b/njs/njs_function.c
@@ -412,7 +412,7 @@ njs_function_call(njs_vm_t *vm, njs_index_t retval, size_t advance)
     frame->return_address = vm->current + advance;
 
     lambda = function->u.lambda;
-    vm->current = lambda->u.start;
+    vm->current = lambda->start;
 
 #if (NXT_DEBUG)
     vm->scopes[NJS_SCOPE_CALLEE_ARGUMENTS] = NULL;

diff --git a/njs/njs_function.h b/njs/njs_function.h
index e6b35e31f9f25450c97db8922d5165ec63af045f..27fc6b69b1f7ed4c2ff897d5eacd81cae33ee6d3 100644 (file)
--- a/njs/njs_function.h
+++ b/njs/njs_function.h
@@ -36,10 +36,8 @@ struct njs_function_lambda_s {
     njs_value_t                    *local_scope;
     njs_value_t                    *closure_scope;
 
-    union {
-        u_char                     *start;
-        njs_parser_t               *parser;
-    } u;
+    u_char                         *start;
+    njs_parser_t                   *parser;
 };
 
 

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 1ee7072ad1bfb9947c5f73d4a969b52b19dbbcd5..755490500b533ac8f8c9a1652a7b268c19c3cc2f 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -2007,6 +2007,11 @@ njs_generate_function_declaration(njs_vm_t *vm, njs_parser_t *parser,
         return NXT_ERROR;
     }
 
+    if (!njs_is_function(&var->value)) {
+        /* A variable was declared with the same name. */
+        return NXT_OK;
+    }
+
     lambda = var->value.data.u.function->u.lambda;
 
     ret = njs_generate_function_scope(vm, lambda, node);
@@ -2032,7 +2037,7 @@ njs_generate_function_scope(njs_vm_t *vm, njs_function_lambda_t *lambda,
     nxt_array_t   *closure;
     njs_parser_t  *parser;
 
-    parser = lambda->u.parser;
+    parser = lambda->parser;
     node = node->right;
 
     parser->code_size += node->scope->argument_closures
@@ -2058,7 +2063,7 @@ njs_generate_function_scope(njs_vm_t *vm, njs_function_lambda_t *lambda,
 
         lambda->local_size = parser->scope_size;
         lambda->local_scope = parser->local_scope;
-        lambda->u.start = parser->code_start;
+        lambda->start = parser->code_start;
     }
 
     return ret;

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index bdfc0a5c66cf4f9ce0f37c69a9b4b4ceb50069c7..9f88041ca7b8e35c052ed6172cf8d649b3b4d640 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -496,7 +496,7 @@ njs_parser_function_declaration(njs_vm_t *vm, njs_parser_t *parser)
         return NJS_TOKEN_ERROR;
     }
 
-    function->u.lambda->u.parser = parser;
+    function->u.lambda->parser = parser;
 
     token = njs_parser_function_lambda(vm, function->u.lambda, token);
 
@@ -578,7 +578,7 @@ njs_parser_function_expression(njs_vm_t *vm, njs_parser_t *parser)
     }
 
     node->u.value.data.u.lambda = lambda;
-    lambda->u.parser = parser;
+    lambda->parser = parser;
 
     token = njs_parser_function_lambda(vm, lambda, token);
 
@@ -619,7 +619,7 @@ njs_parser_function_lambda(njs_vm_t *vm, njs_function_lambda_t *lambda,
     njs_variable_t     *arg;
     njs_parser_node_t  *node, *body, *last;
 
-    parser = lambda->u.parser;
+    parser = lambda->parser;
 
     ret = njs_parser_scope_begin(vm, parser, NJS_SCOPE_FUNCTION);
     if (nxt_slow_path(ret != NXT_OK)) {

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index fa8253bb077cb9c2e610f3c1dfb970664b7f2b05..945c221fd2de588b86c9ab7910b67021e61f86db 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -119,12 +119,17 @@ njs_variable_add(njs_vm_t *vm, njs_parser_t *parser, njs_variable_type_t type)
         }
     }
 
+    if (nxt_lvlhsh_find(&scope->variables, &lhq) == NXT_OK) {
+        var = lhq.value;
+        return var;
+    }
+
     var = njs_variable_alloc(vm, &lhq.key, type);
     if (nxt_slow_path(var == NULL)) {
         return var;
     }
 
-    lhq.replace = vm->options.accumulative;
+    lhq.replace = 0;
     lhq.value = var;
     lhq.pool = vm->mem_cache_pool;
 
@@ -137,15 +142,7 @@ njs_variable_add(njs_vm_t *vm, njs_parser_t *parser, njs_variable_type_t type)
     nxt_mem_cache_free(vm->mem_cache_pool, var->name.start);
     nxt_mem_cache_free(vm->mem_cache_pool, var);
 
-    if (ret == NXT_ERROR) {
-        return NULL;
-    }
-
-    /* ret == NXT_DECLINED. */
-
-    njs_parser_syntax_error(vm, parser, "Identifier \"%.*s\" "
-                            "has already been declared",
-                            (int) lhq.key.length, lhq.key.start);
+    njs_type_error(vm, "lvlhsh insert failed");
 
     return NULL;
 }

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 73c8dbca7d6d9c8a66abd458e1212fce45e9a366..f43e962f428923c66ca4dd0771b49b76fbe98299 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -75,11 +75,34 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("if(1)if(0){0?0:0}else\nvar a\nelse\nvar b"),
       nxt_string("undefined") },
 
-    { nxt_string("function f(){} function f(){}"),
-      nxt_string("SyntaxError: Identifier \"f\" has already been declared in 1") },
+    { nxt_string("var a = 1; var a; a"),
+      nxt_string("1") },
+
+    { nxt_string("(function (x) {if (x) { var a = 3; return a} else { var a = 4; return a}})(1)"),
+      nxt_string("3") },
+
+    { nxt_string("(function (x) {if (x) { var a = 3; return a} else { var a = 4; return a}})(0)"),
+      nxt_string("4") },
+
+    { nxt_string("function f(){return 2}; var f; f()"),
+      nxt_string("2") },
+
+    { nxt_string("function f(){return 2}; var f = 1; f()"),
+      nxt_string("TypeError: number is not a function") },
 
-    { nxt_string("var f = 1; function f() {}"),
-      nxt_string("SyntaxError: Identifier \"f\" has already been declared in 1") },
+    { nxt_string("function f(){return 1}; function f(){return 2}; f()"),
+      nxt_string("2") },
+
+    { nxt_string("var f = 1; function f() {}; f"),
+      nxt_string("1") },
+
+#if 0 /* TODO */
+    { nxt_string("var a; Object.getOwnPropertyDescriptor(this, 'a').value"),
+      nxt_string("undefined") },
+
+    { nxt_string("this.a = 1; a"),
+      nxt_string("1") },
+#endif
 
     { nxt_string("f() = 1"),
       nxt_string("ReferenceError: Invalid left-hand side in assignment in 1") },