Merge pull request #4276 from rickyvetter/forin

change for_in impl for arrays

Author: bobzhang

jscomp/runtime/caml_obj.ml

@@ -34,9 +34,15 @@ module O = struct
   external isArray : 'a -> bool = "Array.isArray" [@@bs.val]
   type key = string
   let for_in : (Caml_obj_extern.t -> (key -> unit) -> unit)  = 
-    [%raw{|function(o,foo){
-        for (var x in o) { foo(x) }}
-      |}]
+    [%raw{|function (o, foo) {
+      if (Array.isArray(o)) {
+        for (var x = 0; x < o.length; x++) {
+          foo(x)
+        }
+      } else {
+        for (var x in o) { foo(x) }
+      }
+    }|}]
   external hasOwnProperty :    
     t -> key -> bool = "hasOwnProperty" [@@bs.send]
   external get_value : Caml_obj_extern.t -> key -> Caml_obj_extern.t = ""[@@bs.get_index]
@@ -133,12 +139,15 @@ let caml_lazy_make (fn : _ -> _) =
    In most cases, rec value comes from record/modules, 
    whose tag is 0, we optimize that case
 *)
-let caml_update_dummy : _ -> _ -> unit= [%raw{|function(x,y){
-  for (var k in y){
-    x[k] = y[k]
+let caml_update_dummy : _ -> _ -> unit= [%raw{|function (x, y) {
+  if (Array.isArray(y)) {
+    for (var k = 0; k < y.length; k++) {
+      x[k] = y[k]
+    }
+  } else {
+    for (var k in y) { x[k] = y[k] }
   }
-  }
-|}]
+}|}]
 
 (* Caml_obj_extern.set_length x   (Caml_obj_extern.length y) *)
 (* [set_length] seems redundant here given that it is initialized as an array 

lib/es6/caml_obj.js

@@ -4,8 +4,15 @@ import * as Block from "./block.js";
 import * as Caml_primitive from "./caml_primitive.js";
 import * as Caml_builtin_exceptions from "./caml_builtin_exceptions.js";
 
-var for_in = (function(o,foo){
-        for (var x in o) { foo(x) }});
+var for_in = (function (o, foo) {
+      if (Array.isArray(o)) {
+        for (var x = 0; x < o.length; x++) {
+          foo(x)
+        }
+      } else {
+        for (var x in o) { foo(x) }
+      }
+    });
 
 function caml_obj_block(tag, size) {
   var v = new Array(size);
@@ -54,11 +61,15 @@ function caml_lazy_make(fn) {
   return block;
 }
 
-var caml_update_dummy = (function(x,y){
-  for (var k in y){
-    x[k] = y[k]
+var caml_update_dummy = (function (x, y) {
+  if (Array.isArray(y)) {
+    for (var k = 0; k < y.length; k++) {
+      x[k] = y[k]
+    }
+  } else {
+    for (var k in y) { x[k] = y[k] }
   }
-  });
+});
 
 function caml_compare(_a, _b) {
   while(true) {

lib/js/caml_obj.js

@@ -4,8 +4,15 @@ var Block = require("./block.js");
 var Caml_primitive = require("./caml_primitive.js");
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
 
-var for_in = (function(o,foo){
-        for (var x in o) { foo(x) }});
+var for_in = (function (o, foo) {
+      if (Array.isArray(o)) {
+        for (var x = 0; x < o.length; x++) {
+          foo(x)
+        }
+      } else {
+        for (var x in o) { foo(x) }
+      }
+    });
 
 function caml_obj_block(tag, size) {
   var v = new Array(size);
@@ -54,11 +61,15 @@ function caml_lazy_make(fn) {
   return block;
 }
 
-var caml_update_dummy = (function(x,y){
-  for (var k in y){
-    x[k] = y[k]
+var caml_update_dummy = (function (x, y) {
+  if (Array.isArray(y)) {
+    for (var k = 0; k < y.length; k++) {
+      x[k] = y[k]
+    }
+  } else {
+    for (var k in y) { x[k] = y[k] }
   }
-  });
+});
 
 function caml_compare(_a, _b) {
   while(true) {