Filtering out integer indices in njs_object_completions().

This closes #285 issue on Github.

diff --git a/src/njs_builtin.c b/src/njs_builtin.c
index 69a3989271fd5b092fd7c3b5f3de6c3a6adf0566..2804b7d81dc0496adb74150fa2ec1455b3e5c760 100644 (file)
--- a/src/njs_builtin.c
+++ b/src/njs_builtin.c
@@ -24,7 +24,7 @@ typedef struct {
 
 static njs_arr_t *njs_vm_expression_completions(njs_vm_t *vm,
     njs_str_t *expression);
-static njs_arr_t *njs_object_completions(njs_vm_t *vm, njs_object_t *object);
+static njs_arr_t *njs_object_completions(njs_vm_t *vm, njs_value_t *object);
 static njs_int_t njs_env_hash_init(njs_vm_t *vm, njs_lvlhsh_t *hash,
     char **environment);
 
@@ -633,110 +633,59 @@ njs_vm_expression_completions(njs_vm_t *vm, njs_str_t *expression)
         value = &prop->value;
     }
 
-    return njs_object_completions(vm, njs_object(value));
+    return njs_object_completions(vm, value);
 }
 
 
 static njs_arr_t *
-njs_object_completions(njs_vm_t *vm, njs_object_t *object)
+njs_object_completions(njs_vm_t *vm, njs_value_t *object)
 {
-    size_t             size;
-    njs_str_t          *compl;
-    njs_arr_t          *completions;
-    njs_uint_t         n, k;
-    njs_object_t       *o;
-    njs_object_prop_t  *prop;
-    njs_lvlhsh_each_t  lhe;
+    double            num;
+    njs_arr_t         *array;
+    njs_str_t         *completion;
+    njs_uint_t        n;
+    njs_array_t       *keys;
+    njs_value_type_t  type;
 
-    size = 0;
-    o = object;
+    array = NULL;
+    type = object->type;
 
-    do {
-        njs_lvlhsh_each_init(&lhe, &njs_object_hash_proto);
-
-        for ( ;; ) {
-            prop = njs_lvlhsh_each(&o->hash, &lhe);
-            if (prop == NULL) {
-                break;
-            }
-
-            size++;
-        }
-
-        njs_lvlhsh_each_init(&lhe, &njs_object_hash_proto);
-
-        for ( ;; ) {
-            prop = njs_lvlhsh_each(&o->shared_hash, &lhe);
-            if (prop == NULL) {
-                break;
-            }
-
-            size++;
-        }
-
-        o = o->__proto__;
-
-    } while (o != NULL);
-
-    completions = njs_arr_create(vm->mem_pool, size, sizeof(njs_str_t));
-    if (njs_slow_path(completions == NULL)) {
-        return NULL;
+    if (type == NJS_ARRAY || type == NJS_TYPED_ARRAY) {
+        object->type = NJS_OBJECT;
     }
 
-    n = 0;
-    o = object;
-    compl = completions->start;
-
-    do {
-        njs_lvlhsh_each_init(&lhe, &njs_object_hash_proto);
-
-        for ( ;; ) {
-            prop = njs_lvlhsh_each(&o->hash, &lhe);
-            if (prop == NULL) {
-                break;
-            }
-
-            njs_string_get(&prop->name, &compl[n]);
-
-            for (k = 0; k < n; k++) {
-                if (njs_strstr_eq(&compl[k], &compl[n])) {
-                    break;
-                }
-            }
-
-            if (k == n) {
-                n++;
-            }
-        }
-
-        njs_lvlhsh_each_init(&lhe, &njs_object_hash_proto);
+    keys = njs_value_enumerate(vm, object, NJS_ENUM_KEYS, NJS_ENUM_STRING, 1);
+    if (njs_slow_path(keys == NULL)) {
+        goto done;
+    }
 
-        for ( ;; ) {
-            prop = njs_lvlhsh_each(&o->shared_hash, &lhe);
-            if (prop == NULL) {
-                break;
-            }
+    array = njs_arr_create(vm->mem_pool, 8, sizeof(njs_str_t));
+    if (njs_slow_path(array == NULL)) {
+        goto done;
+    }
 
-            njs_string_get(&prop->name, &compl[n]);
+    for (n = 0; n < keys->length; n++) {
+        num = njs_key_to_index(&keys->start[n]);
 
-            for (k = 0; k < n; k++) {
-                if (njs_strstr_eq(&compl[k], &compl[n])) {
-                    break;
-                }
+        if (!njs_key_is_integer_index(num, &keys->start[n])) {
+            completion = njs_arr_add(array);
+            if (njs_slow_path(completion == NULL)) {
+                njs_arr_destroy(array);
+                array = NULL;
+                goto done;
             }
 
-            if (k == n) {
-                n++;
-            }
+            njs_string_get(&keys->start[n], completion);
         }
+    }
 
-        o = o->__proto__;
-
-    } while (o != NULL);
+done:
 
-    completions->items = n;
+    if (type == NJS_ARRAY || type == NJS_TYPED_ARRAY) {
+        object->type = type;
+    }
 
-    return completions;
+    return array;
 }
 
 

diff --git a/test/njs_expect_test.exp b/test/njs_expect_test.exp
index 447b6a7497b4d658427853e35dea23024e6f45e8..1731d2c93339bff3d9d4eab44dec648c6517dc99 100644 (file)
--- a/test/njs_expect_test.exp
+++ b/test/njs_expect_test.exp
@@ -192,6 +192,27 @@ njs_test {
      "o.a.toDateString*o.a.toLocaleDateString*o.a.toString"}
 }
 
+njs_test {
+    {"var o = {a:1,b:2,333:'t'}\r\n"
+     "var o = {a:1,b:2,333:'t'}\r\nundefined\r\n>> "}
+    {"o.3\t\t"
+     "o.3"}
+}
+
+njs_test {
+    {"var a = Array(5000000); a.aab = 1; a.aac = 2\r\n"
+     "var a = Array(5000000); a.aab = 1; a.aac = 2\r\n2\r\n>> "}
+    {"a.\t\t"
+     "a.aab*"}
+}
+
+njs_test {
+    {"var a = new Uint8Array([5,6,7,8,8]); a.aab = 1; a.aac = 2\r\n"
+     "var a = new Uint8Array(\\\[5,6,7,8,8]); a.aab = 1; a.aac = 2\r\n2\r\n>> "}
+    {"a.\t\t"
+     "a.aab*"}
+}
+
 # function declarations in interactive mode
 njs_test {
     {"function a() { return 1; }\r\n"