Refactored variable reference.

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 12ebaf79b6488e82a29e9a2c8752204cce65afb3..78a8a142d5f2d715250219fb67506d918578a563 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -1648,13 +1648,11 @@ njs_generate_assignment(njs_vm_t *vm, njs_generator_t *generator,
 
     if (lvalue->token == NJS_TOKEN_NAME) {
 
-        index = njs_variable_index(vm, lvalue);
-        if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
-            return NXT_ERROR;
+        ret = njs_generate_variable(vm, generator, lvalue);
+        if (nxt_slow_path(ret != NXT_OK)) {
+            return ret;
         }
 
-        lvalue->index = index;
-
         expr->dest = lvalue;
 
         ret = njs_generator(vm, generator, expr);
@@ -1757,6 +1755,7 @@ njs_generate_operation_assignment(njs_vm_t *vm, njs_generator_t *generator,
     lvalue = node->left;
 
     if (lvalue->token == NJS_TOKEN_NAME) {
+
         ret = njs_generate_variable(vm, generator, lvalue);
         if (nxt_slow_path(ret != NXT_OK)) {
             return ret;

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 521e0a536f45ac293fab149cbe93a185847394b2..e40c7478a30039f370a4bef48be87323b4b6165e 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -522,6 +522,19 @@ njs_parser_variable_node(njs_vm_t *vm, njs_parser_t *parser, nxt_str_t *name,
         return NULL;
     }
 
+    if (njs_is_null(&var->value)) {
+
+        switch (type) {
+
+        case NJS_VARIABLE_VAR:
+            var->value = njs_value_undefined;
+            break;
+
+        default:
+            break;
+        }
+    }
+
     node = njs_parser_node_new(vm, parser, NJS_TOKEN_NAME);
     if (nxt_slow_path(node == NULL)) {
         return NULL;
@@ -1389,7 +1402,7 @@ njs_parser_for_statement(njs_vm_t *vm, njs_parser_t *parser)
             init = parser->node;
 
             if (init->token == NJS_TOKEN_FOR_IN) {
-                return token;
+                goto done;
             }
 
         } else {
@@ -1404,7 +1417,12 @@ njs_parser_for_statement(njs_vm_t *vm, njs_parser_t *parser)
             init = parser->node;
 
             if (init->token == NJS_TOKEN_IN) {
-                return njs_parser_for_in_statement(vm, parser, &name, token);
+                token = njs_parser_for_in_statement(vm, parser, &name, token);
+                if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
+                    return token;
+                }
+
+                goto done;
             }
         }
     }
@@ -1475,6 +1493,8 @@ njs_parser_for_statement(njs_vm_t *vm, njs_parser_t *parser)
 
     parser->node = node;
 
+done:
+
     return token;
 }
 

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index 7eaa3597a437389197e32622a6642d33defb4d47..d1ce5383d3e6492eae971ab8fcd7ce267201a7fb 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -360,7 +360,6 @@ njs_variable_resolve(njs_vm_t *vm, njs_parser_node_t *node)
     nxt_uint_t                scope_index;
     njs_index_t               index;
     njs_variable_t            *var;
-    const njs_value_t         *default_value;
     njs_variable_reference_t  *vr;
 
     vr = &node->u.reference;
@@ -398,14 +397,7 @@ njs_variable_resolve(njs_vm_t *vm, njs_parser_node_t *node)
         var->argument = index;
     }
 
-    if (vr->type != NJS_DECLARATION && var->type <= NJS_VARIABLE_LET) {
-        goto not_found;
-    }
-
-    default_value = njs_is_object(&var->value) ? &var->value :
-                                                 &njs_value_undefined;
-
-    index = njs_scope_next_index(vm, vr->scope, scope_index, default_value);
+    index = njs_scope_next_index(vm, vr->scope, scope_index, &var->value);
 
     if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
         return NULL;