Merge pull request #4297 from BuckleScript/codegen_tweak

code generation micro-tweak

Author: bobzhang

jscomp/core/lam_compile.ml

@@ -1607,7 +1607,10 @@ and compile_lambda
       compile_while p body lambda_cxt
     | Lfor (id,start,finish,direction,body) ->  
       begin match direction,finish with 
-        | Upto, Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} ->
+        | Upto, 
+          (Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} |
+          Lprim {primitive = Poffsetint (-1); args = [ new_finish ;  ]}
+          ) ->
           compile_for id start new_finish Up body lambda_cxt
         | _ -> 
           compile_for id start finish (if direction = Upto then Upto else Downto) body lambda_cxt

jscomp/test/bench.js

@@ -30,7 +30,7 @@ function init(l, f) {
         ];
   }
   var res = Caml_array.caml_make_vect(l, f$1(0));
-  for(var i = 1 ,i_finish = l - 1 | 0; i <= i_finish; ++i){
+  for(var i = 1; i < l; ++i){
     res[i] = f$1(i);
   }
   return res;

jscomp/test/earger_curry_test.js

@@ -32,7 +32,7 @@ function init(l, f) {
         ];
   }
   var res = Caml_array.caml_make_vect(l, f$1(0));
-  for(var i = 1 ,i_finish = l - 1 | 0; i <= i_finish; ++i){
+  for(var i = 1; i < l; ++i){
     res[i] = f$1(i);
   }
   return res;

jscomp/test/ext_string_test.js

@@ -238,7 +238,7 @@ function is_empty(s) {
 function repeat(n, s) {
   var len = s.length;
   var res = Caml_bytes.caml_create_bytes(Caml_int32.imul(n, len));
-  for(var i = 0 ,i_finish = n - 1 | 0; i <= i_finish; ++i){
+  for(var i = 0; i < n; ++i){
     $$String.blit(s, 0, res, Caml_int32.imul(i, len), len);
   }
   return Bytes.to_string(res);

lib/4.06.1/unstable/js_compiler.ml

@@ -404897,7 +404897,10 @@ and compile_lambda
       compile_while p body lambda_cxt
     | Lfor (id,start,finish,direction,body) ->  
       begin match direction,finish with 
-        | Upto, Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} ->
+        | Upto, 
+          (Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} |
+          Lprim {primitive = Poffsetint (-1); args = [ new_finish ;  ]}
+          ) ->
           compile_for id start new_finish Up body lambda_cxt
         | _ -> 
           compile_for id start finish (if direction = Upto then Upto else Downto) body lambda_cxt

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -404897,7 +404897,10 @@ and compile_lambda
       compile_while p body lambda_cxt
     | Lfor (id,start,finish,direction,body) ->  
       begin match direction,finish with 
-        | Upto, Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} ->
+        | Upto, 
+          (Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} |
+          Lprim {primitive = Poffsetint (-1); args = [ new_finish ;  ]}
+          ) ->
           compile_for id start new_finish Up body lambda_cxt
         | _ -> 
           compile_for id start finish (if direction = Upto then Upto else Downto) body lambda_cxt

lib/4.06.1/whole_compiler.ml

@@ -398843,7 +398843,10 @@ and compile_lambda
       compile_while p body lambda_cxt
     | Lfor (id,start,finish,direction,body) ->  
       begin match direction,finish with 
-        | Upto, Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} ->
+        | Upto, 
+          (Lprim {primitive = Psubint ; args = [ new_finish ; Lconst (Const_int 1) ]} |
+          Lprim {primitive = Poffsetint (-1); args = [ new_finish ;  ]}
+          ) ->
           compile_for id start new_finish Up body lambda_cxt
         | _ -> 
           compile_for id start finish (if direction = Upto then Upto else Downto) body lambda_cxt

lib/es6/array.js

@@ -22,15 +22,15 @@ function init(l, f) {
         ];
   }
   var res = Caml_array.caml_make_vect(l, Curry._1(f, 0));
-  for(var i = 1 ,i_finish = l - 1 | 0; i <= i_finish; ++i){
+  for(var i = 1; i < l; ++i){
     res[i] = Curry._1(f, i);
   }
   return res;
 }
 
 function make_matrix(sx, sy, init) {
   var res = Caml_array.caml_make_vect(sx, []);
-  for(var x = 0 ,x_finish = sx - 1 | 0; x <= x_finish; ++x){
+  for(var x = 0; x < sx; ++x){
     res[x] = Caml_array.caml_make_vect(sy, init);
   }
   return res;

lib/js/array.js

@@ -22,15 +22,15 @@ function init(l, f) {
         ];
   }
   var res = Caml_array.caml_make_vect(l, Curry._1(f, 0));
-  for(var i = 1 ,i_finish = l - 1 | 0; i <= i_finish; ++i){
+  for(var i = 1; i < l; ++i){
     res[i] = Curry._1(f, i);
   }
   return res;
 }
 
 function make_matrix(sx, sy, init) {
   var res = Caml_array.caml_make_vect(sx, []);
-  for(var x = 0 ,x_finish = sx - 1 | 0; x <= x_finish; ++x){
+  for(var x = 0; x < sx; ++x){
     res[x] = Caml_array.caml_make_vect(sy, init);
   }
   return res;