Simplified typeof operation.

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 470c66dd6981616e36b6fc1a3262589b20c9fa02..ae5341cd2dd56472613b74c77e2ea53aad37cef0 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -575,7 +575,7 @@ njs_generate_builtin_object(njs_vm_t *vm, njs_generator_t *generator,
     njs_vmcode_object_copy_t  *copy;
 
     index = njs_variable_index(vm, node);
-    if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
+    if (nxt_slow_path(index == NJS_INDEX_NONE)) {
         return NXT_ERROR;
     }
 
@@ -600,7 +600,7 @@ njs_generate_variable(njs_vm_t *vm, njs_generator_t *generator,
     njs_index_t  index;
 
     index = njs_variable_index(vm, node);
-    if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
+    if (nxt_slow_path(index == NJS_INDEX_NONE)) {
         return NXT_ERROR;
     }
 
@@ -622,7 +622,7 @@ njs_generate_var_statement(njs_vm_t *vm, njs_generator_t *generator,
     lvalue = node->left;
 
     index = njs_variable_index(vm, lvalue);
-    if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
+    if (nxt_slow_path(index == NJS_INDEX_NONE)) {
         return NXT_ERROR;
     }
 
@@ -2128,6 +2128,17 @@ njs_generate_typeof_operation(njs_vm_t *vm, njs_generator_t *generator,
     if (expr->token == NJS_TOKEN_NAME) {
         expr->index = njs_variable_typeof(vm, expr);
 
+        if (expr->u.reference.variable) {
+            ret = njs_generate_variable(vm, generator, expr);
+            if (nxt_slow_path(ret != NXT_OK)) {
+                return NXT_ERROR;
+            }
+
+        } else {
+            expr->index = njs_value_index(vm, &njs_value_undefined,
+                                          generator->runtime);
+        }
+
     } else {
         ret = njs_generator(vm, generator, node->left);
         if (nxt_slow_path(ret != NXT_OK)) {
@@ -2794,7 +2805,7 @@ njs_generate_try_statement(njs_vm_t *vm, njs_generator_t *generator,
         /* A "try/catch" case. */
 
         catch_index = njs_variable_index(vm, node->left);
-        if (nxt_slow_path(catch_index == NJS_INDEX_ERROR)) {
+        if (nxt_slow_path(catch_index == NJS_INDEX_NONE)) {
             return NXT_ERROR;
         }
 
@@ -2853,7 +2864,7 @@ njs_generate_try_statement(njs_vm_t *vm, njs_generator_t *generator,
             /* A try/catch/finally case. */
 
             catch_index = njs_variable_index(vm, node->left->left);
-            if (nxt_slow_path(catch_index == NJS_INDEX_ERROR)) {
+            if (nxt_slow_path(catch_index == NJS_INDEX_NONE)) {
                 return NXT_ERROR;
             }
 
@@ -3039,7 +3050,7 @@ njs_generate_import_statement(njs_vm_t *vm, njs_generator_t *generator,
     expr = node->right;
 
     index = njs_variable_index(vm, lvalue);
-    if (nxt_slow_path(index == NJS_INDEX_ERROR)) {
+    if (nxt_slow_path(index == NJS_INDEX_NONE)) {
         return NXT_ERROR;
     }
 

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index d1ce5383d3e6492eae971ab8fcd7ce267201a7fb..dc6e963bde498b5eaf1130df765794f9e131798f 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -349,7 +349,7 @@ njs_variable_index(njs_vm_t *vm, njs_parser_node_t *node)
         return var->index;
     }
 
-    return NJS_INDEX_ERROR;
+    return NJS_INDEX_NONE;
 }
 
 

diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index b2606c2043bd82c5ff9fad3e43af0e664121de5e..64b4b2ca6538db6b61d6bad9c2697d1a3032ba5f 100644 (file)
--- a/njs/njs_vm.c
+++ b/njs/njs_vm.c
@@ -993,8 +993,6 @@ njs_vmcode_post_decrement(njs_vm_t *vm, njs_value_t *reference,
 njs_ret_t
 njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld)
 {
-    nxt_uint_t  type;
-
     /* ECMAScript 5.1: null, array and regexp are objects. */
 
     static const njs_value_t  *types[NJS_TYPE_MAX] = {
@@ -1034,10 +1032,7 @@ njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld)
         &njs_string_object,
     };
 
-    /* A zero index means non-declared variable. */
-    type = (value != NULL) ? value->type : NJS_UNDEFINED;
-
-    vm->retval = *types[type];
+    vm->retval = *types[value->type];
 
     return sizeof(njs_vmcode_2addr_t);
 }