add a primitive js_anything_to_string cml_anything_to_string

jscomp/j.ml

@@ -120,6 +120,27 @@ and expression_desc =
      which makes optimizations easier
      {[ JSON.stringify(value, replacer[, space]) ]}
   *)
+  | Anything_to_string of expression
+  (* for debugging utitlites, 
+     TODO:  [Dump] is not necessary with this primitive 
+     Note that the semantics is slightly different from [JSON.stringify]     
+     {[
+       JSON.stringify("x")       
+     ]}
+     {[
+       ""x""       
+     ]}     
+     {[
+       JSON.stringify(undefined)       
+     ]}     
+     {[
+       undefined       
+     ]}
+     {[ '' + undefined
+     ]}     
+     {[ 'undefined'
+     ]}     
+  *)      
   | Dump of Js_op.level * expression list
     (* to support 
        val log1 : 'a -> unit

jscomp/js_dump.ml

@@ -362,8 +362,8 @@ and expression l cxt  f (exp : J.expression) : Ext_pp_scope.t =
   expression_desc cxt l f exp.expression_desc
 
 and
-  expression_desc cxt (l:int) f expression_desc : Ext_pp_scope.t  =
-  match expression_desc with
+  expression_desc cxt (l:int) f x : Ext_pp_scope.t  =
+  match x with
   | Var v ->
     vident cxt f v 
 
@@ -655,6 +655,11 @@ and
         P.space f ; 
         expression 13 cxt  f delta
     end
+  | Anything_to_string e -> 
+    (* Note that we should not apply any smart construtor here, 
+       it's purely  a convenice for pretty-printing
+    *)    
+    expression_desc cxt l f (Bin (Plus, {expression_desc = Str (true,""); comment = None}, e))    
 
   | Bin (Minus, {expression_desc = Number (Int {i=0;_} | Float {f = "0."})}, e) 
       (* TODO:
@@ -943,6 +948,7 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
       | Call ({expression_desc = Fun _; },_,_) -> true
 
       | Fun _ | Object _ -> true
+      | Anything_to_string _ 
       | String_of_small_int_array _
       | Call _ 
       | Array_append _ 

jscomp/js_fold.ml

@@ -135,6 +135,26 @@ class virtual fold =
                  (* TODO: in the future, it might make sense to group primitivie by type,
      which makes optimizations easier
      {[ JSON.stringify(value, replacer[, space]) ]}
+  *)
+                 (* for debugging utitlites, 
+     TODO:  [Dump] is not necessary with this primitive 
+     Note that the semantics is slightly different from [JSON.stringify]     
+     {[
+       JSON.stringify("x")       
+     ]}
+     {[
+       ""x""       
+     ]}     
+     {[
+       JSON.stringify(undefined)       
+     ]}     
+     {[
+       undefined       
+     ]}
+     {[ '' + undefined
+     ]}     
+     {[ 'undefined'
+     ]}     
   *)
                  (* to support 
        val log1 : 'a -> unit
@@ -329,6 +349,7 @@ class virtual fold =
       | Not _x -> let o = o#expression _x in o
       | String_of_small_int_array _x -> let o = o#expression _x in o
       | Json_stringify _x -> let o = o#expression _x in o
+      | Anything_to_string _x -> let o = o#expression _x in o
       | Dump (_x, _x_i1) ->
           let o = o#unknown _x in
           let o = o#list (fun o -> o#expression) _x_i1 in o

jscomp/js_helper.ml

@@ -142,6 +142,11 @@ module Exp = struct
 
   let str ?(pure=true) ?comment s : t =  {expression_desc = Str (pure,s); comment}
 
+  let any_to_string ?comment (e : t) : t =  
+    match e.expression_desc with 
+    | Str _ -> e 
+    | _ -> {expression_desc = Anything_to_string e ; comment}
+
   (* Shared mutable state is evil 
       [Js_fun_env.empty] is a mutable state ..
    *)    

jscomp/js_helper.mli

@@ -188,6 +188,8 @@ module Exp : sig
   val flat_call : binary_op
 
   val dump : ?comment:string -> Js_op.level -> t list -> t
+
+  val any_to_string : unary_op
   val to_json_string : unary_op
 
   val new_ : ?comment:string -> J.expression -> J.expression list -> t

jscomp/js_map.ml

@@ -148,6 +148,26 @@ class virtual map =
                  (* TODO: in the future, it might make sense to group primitivie by type,
      which makes optimizations easier
      {[ JSON.stringify(value, replacer[, space]) ]}
+  *)
+                 (* for debugging utitlites, 
+     TODO:  [Dump] is not necessary with this primitive 
+     Note that the semantics is slightly different from [JSON.stringify]     
+     {[
+       JSON.stringify("x")       
+     ]}
+     {[
+       ""x""       
+     ]}     
+     {[
+       JSON.stringify(undefined)       
+     ]}     
+     {[
+       undefined       
+     ]}
+     {[ '' + undefined
+     ]}     
+     {[ 'undefined'
+     ]}     
   *)
                  (* to support 
        val log1 : 'a -> unit
@@ -363,6 +383,8 @@ class virtual map =
       | String_of_small_int_array _x ->
           let _x = o#expression _x in String_of_small_int_array _x
       | Json_stringify _x -> let _x = o#expression _x in Json_stringify _x
+      | Anything_to_string _x ->
+          let _x = o#expression _x in Anything_to_string _x
       | Dump (_x, _x_i1) ->
           let _x = o#unknown _x in
           let _x_i1 = o#list (fun o -> o#expression) _x_i1

jscomp/lam_dispatch_primitive.ml

@@ -655,6 +655,16 @@ let query (prim : Lam_compile_env.primitive_description)
          ]}         
       *)      
       E.seq (E.dump Log args) (E.unit ())
+
+    | "caml_anything_to_string"
+    (* patched to compiler to support for convenience *)      
+    | "js_anything_to_string" 
+      ->
+      begin match args with 
+      | [e] -> E.any_to_string e 
+      | _ -> assert false
+      end
+
     | "js_json_stringify"      
       -> 
       begin match args with 

jscomp/lib/js.ml

@@ -24,3 +24,5 @@ external typeof : 'a -> string = "js_typeof"
 external to_json_string : 'a -> string = "js_json_stringify"
 
 external log : 'a -> unit = "js_dump"
+
+external anything_to_string : 'a -> string = "js_anything_to_string"

jscomp/lib/js.mli

@@ -34,3 +34,6 @@ external to_json_string : 'a -> string = "js_json_stringify"
    the return value is [unit] instead of [undefined]
 *)
 external log : 'a -> unit = "js_dump"
+
+
+external anything_to_string : 'a -> string = "js_anything_to_string"

jscomp/test/.depend

@@ -106,8 +106,8 @@ lexer_test.cmo : number_lexer.cmo mt.cmo ../stdlib/list.cmi \
     ../stdlib/lexing.cmi arith_syntax.cmo arith_parser.cmo arith_lexer.cmo
 lexer_test.cmx : number_lexer.cmx mt.cmx ../stdlib/list.cmx \
     ../stdlib/lexing.cmx arith_syntax.cmx arith_parser.cmx arith_lexer.cmx
-lib_js_test.cmo : ../lib/js.cmi
-lib_js_test.cmx : ../lib/js.cmx
+lib_js_test.cmo : mt.cmo ../lib/js.cmi
+lib_js_test.cmx : mt.cmx ../lib/js.cmx
 list_test.cmo : ../stdlib/pervasives.cmi mt.cmo ../stdlib/list.cmi \
     ../stdlib/array.cmi
 list_test.cmx : ../stdlib/pervasives.cmx mt.cmx ../stdlib/list.cmx \
@@ -462,8 +462,8 @@ lexer_test.cmo : number_lexer.cmo mt.cmo ../stdlib/list.cmi \
     ../stdlib/lexing.cmi arith_syntax.cmo arith_parser.cmo arith_lexer.cmo
 lexer_test.cmj : number_lexer.cmj mt.cmj ../stdlib/list.cmj \
     ../stdlib/lexing.cmj arith_syntax.cmj arith_parser.cmj arith_lexer.cmj
-lib_js_test.cmo : ../lib/js.cmi
-lib_js_test.cmj : ../lib/js.cmj
+lib_js_test.cmo : mt.cmo ../lib/js.cmi
+lib_js_test.cmj : mt.cmj ../lib/js.cmj
 list_test.cmo : ../stdlib/pervasives.cmi mt.cmo ../stdlib/list.cmi \
     ../stdlib/array.cmi
 list_test.cmj : ../stdlib/pervasives.cmj mt.cmj ../stdlib/list.cmj \

jscomp/test/lib_js_test.d.ts

@@ -1 +1,2 @@
+export var suites: any ;
 

jscomp/test/lib_js_test.js

@@ -1,6 +1,7 @@
 // Generated CODE, PLEASE EDIT WITH CARE
 "use strict";
 
+var Mt = require("./mt");
 
 console.log(JSON.stringify([
           /* :: */0,
@@ -18,4 +19,25 @@ console.log(JSON.stringify([
 
 console.log("hey");
 
+var suites_001 = [
+  /* tuple */0,
+  "anything_to_string",
+  function () {
+    return [
+            /* Eq */0,
+            "3",
+            "" + 3
+          ];
+  }
+];
+
+var suites = [
+  /* :: */0,
+  suites_001,
+  /* [] */0
+];
+
+Mt.from_pair_suites("lib_js_test.ml", suites);
+
+exports.suites = suites;
 /*  Not a pure module */

jscomp/test/lib_js_test.ml

@@ -1,6 +1,15 @@
+
+
+
 let () =
   begin
 
     Js.log @@ Js.to_json_string [1;2;3];
     Js.log "hey";
   end
+
+let suites = Mt.[
+    "anything_to_string", (fun _ -> Eq("3", Js.anything_to_string 3 ))    
+]
+
+;; Mt.from_pair_suites __FILE__ suites