Merge pull request #63 from bloomberg/refine_kind_in_js

refine let_kind in js ir, simplify [string_of_int] and other micro-optimizations

Author: bobzhang

jscomp/j.ml

@@ -100,7 +100,7 @@ and expression_desc =
        since GC does not rely on it
      *)
   | Array_copy of expression (* shallow copy, like [x.slice] *)
-  | Array_append of expression * expression list (* For [caml_array_append]*)
+  | Array_append of expression * expression (* For [caml_array_append]*)
   | Tag_ml_obj of expression
   | String_append of expression * expression 
   | Int_of_boolean of expression 

jscomp/js_dump.ml

@@ -432,7 +432,7 @@ and
     P.group f 1 (fun _ -> 
         let cxt = expression 15 cxt f e in
         P.string f ".concat";
-        P.paren_group f 1 (fun _ -> arguments cxt f el))
+        P.paren_group f 1 (fun _ -> arguments cxt f [el]))
 
   | Array_copy e -> 
     P.group f 1 (fun _ -> 

jscomp/js_fold.ml

@@ -339,8 +339,7 @@ class virtual fold =
       | Array_of_size _x -> let o = o#expression _x in o
       | Array_copy _x -> let o = o#expression _x in o
       | Array_append (_x, _x_i1) ->
-          let o = o#expression _x in
-          let o = o#list (fun o -> o#expression) _x_i1 in o
+          let o = o#expression _x in let o = o#expression _x_i1 in o
       | Tag_ml_obj _x -> let o = o#expression _x in o
       | String_append (_x, _x_i1) ->
           let o = o#expression _x in let o = o#expression _x_i1 in o

jscomp/js_helper.ml

@@ -142,15 +142,26 @@ module Exp = struct
 
   let str ?(pure=true) ?comment s : t =  {expression_desc = Str (pure,s); comment}
 
-  let any_to_string ?comment (e : t) : t =  
+  let anything_to_string ?comment (e : t) : t =  
     match e.expression_desc with 
     | Str _ -> e 
     | _ -> {expression_desc = Anything_to_string e ; comment}
-    
+
+  (* we can do constant folding here, but need to make sure the result is consistent
+     {[
+       let f x = string_of_int x        
+       ;; f 3            
+     ]}     
+     {[
+       string_of_int 3
+     ]}
+  *)
+  let int_to_string ?comment (e : t) : t = 
+    anything_to_string ?comment e 
   (* Shared mutable state is evil 
       [Js_fun_env.empty] is a mutable state ..
    *)    
-  let efun ?comment  ?immutable_mask
+  let fun_ ?comment  ?immutable_mask
       params block  : t = 
     let len = List.length params in
     {
@@ -308,6 +319,8 @@ module Exp = struct
         String_append ({expression_desc = Str(_,c)} ,d) ->
         string_append ?comment (string_append a (str (b ^ c))) d 
     | Str (_,a), Str (_,b) -> str ?comment (a ^ b)
+    | _, Anything_to_string b -> string_append ?comment e b 
+    | Anything_to_string b, _ -> string_append ?comment b el
     | _, _ -> {comment ; expression_desc = String_append(e,el)}
 
 
@@ -911,12 +924,7 @@ module Stmt = struct
         { statement_desc = Exp e; comment}
 
   let declare_variable ?comment  ?ident_info  ~kind (v:Ident.t)  : t=
-    let property : J.property = 
-      match (kind : Lambda.let_kind ) with 
-      | (Alias | Strict | StrictOpt )
-        -> Immutable 
-      | Variable -> Mutable 
-    in
+    let property : J.property =  kind in
     let ident_info  : J.ident_info  = 
       match ident_info with
       | None ->  {used_stats = NA}
@@ -927,12 +935,7 @@ module Stmt = struct
      comment}
 
   let define ?comment  ?ident_info ~kind (v:Ident.t) exp    : t=
-    let property : J.property = 
-      match (kind : Lambda.let_kind ) with 
-      | (Alias | Strict | StrictOpt )
-        -> Immutable 
-      | Variable -> Mutable 
-    in
+    let property : J.property =  kind in
     let ident_info  : J.ident_info  = 
       match ident_info with
       | None ->  {used_stats = NA}
@@ -1130,10 +1133,10 @@ module Stmt = struct
 
 
 
-  let const_variable ?comment  ?exp (v:Ident.t)  : t=
+  let alias_variable ?comment  ?exp (v:Ident.t)  : t=
     {statement_desc = 
      Variable {
-     ident = v; value = exp; property = Immutable;
+     ident = v; value = exp; property = Alias;
      ident_info = {used_stats = NA }   };
      comment}
 
@@ -1152,7 +1155,7 @@ module Stmt = struct
       statement_desc = 
       J.Variable { ident =  id; 
                    value = Some (Exp.unit ()) ;
-                   property = Mutable;
+                   property = Variable;
                    ident_info = {used_stats = NA}
                  };
       comment

jscomp/js_helper.mli

@@ -96,7 +96,7 @@ module Exp : sig
 
   val str : ?pure:bool -> ?comment:string -> string -> t 
 
-  val efun : ?comment:string ->
+  val fun_ : ?comment:string ->
     ?immutable_mask:bool array -> J.ident list -> J.block -> t
 
   val econd : ?comment:string -> t -> t -> t -> t
@@ -126,7 +126,7 @@ module Exp : sig
 
   val char_to_int : unary_op
 
-  val array_append : ?comment:string -> t -> t list -> t
+  val array_append : binary_op
 
   val array_copy : unary_op
   val string_append : binary_op
@@ -189,7 +189,8 @@ module Exp : sig
 
   val dump : ?comment:string -> Js_op.level -> t list -> t
 
-  val any_to_string : unary_op
+  val anything_to_string : unary_op
+  val int_to_string : unary_op
   val to_json_string : unary_op
 
   val new_ : ?comment:string -> J.expression -> J.expression list -> t
@@ -285,7 +286,7 @@ module Stmt : sig
     ?ident_info:J.ident_info ->
     kind:Lambda.let_kind -> Ident.t -> J.expression  -> t
 
-  val const_variable :
+  val alias_variable :
       ?comment:string -> ?exp:J.expression -> Ident.t -> t
   val assign : ?comment:string  -> J.ident -> J.expression -> t
 

jscomp/js_inline_and_eliminate.ml

@@ -166,7 +166,7 @@ let subst name export_set stats  =
             ->  self#statement st :: self#block rest 
 
           | { value = Some {expression_desc = Fun (params, block, _env) ; comment = _}; 
-              property = Immutable;
+              property = (Alias | StrictOpt | Strict);
               ident_info = {used_stats = Once_pure };
               ident = _
             } as v

jscomp/js_map.ml

@@ -371,8 +371,7 @@ class virtual map =
       | Array_copy _x -> let _x = o#expression _x in Array_copy _x
       | Array_append (_x, _x_i1) ->
           let _x = o#expression _x in
-          let _x_i1 = o#list (fun o -> o#expression) _x_i1
-          in Array_append (_x, _x_i1)
+          let _x_i1 = o#expression _x_i1 in Array_append (_x, _x_i1)
       | Tag_ml_obj _x -> let _x = o#expression _x in Tag_ml_obj _x
       | String_append (_x, _x_i1) ->
           let _x = o#expression _x in

jscomp/js_op.ml

@@ -127,9 +127,11 @@ type kind =
   | Runtime 
   | External of string
 
-type property = 
-  | Mutable
-  | Immutable
+type property = Lambda.let_kind = 
+  | Strict
+  | Alias
+  | StrictOpt 
+  | Variable
 
 type int_or_char = 
     { i :  int;

jscomp/js_pass_flatten_and_mark_dead.ml

@@ -172,7 +172,7 @@ let subst_map name = object (self)
       {v with statement_desc =  (Exp x)}
 
     | Variable ({ ident ; 
-                  property = Immutable;
+                  property = (Strict | StrictOpt | Alias);
                   value = Some ({expression_desc = (Array ( _:: _ :: _ as ls, Immutable))} as array)
                 } as variable) -> 
       (** If we do this, we should prevent incorrect inlning to inline it into an array :) 

jscomp/js_pass_scope.ml

@@ -196,10 +196,10 @@ let scope_pass  =
       | { ident ; value; property  }  -> 
         let obj = 
           (match self#get_in_loop, property with 
-           | true, Mutable 
+           | true, Variable 
              -> 
              self#add_loop_mutable_variable ident 
-           | true, Immutable
+           | true, (Strict | StrictOpt | Alias)
            (* Not real true immutable in javascript 
                since it's in the loop 
 
@@ -235,10 +235,10 @@ let scope_pass  =
                    (* else  *)
                    self#add_loop_mutable_variable ident
              end
-           | false, Mutable
+           | false, Variable
              -> 
              self#add_mutable_variable ident      
-           | false, Immutable
+           | false, (Strict | StrictOpt | Alias)
              -> self
           )#add_defined_ident ident
         in