Flow: Print tvar ids in comments.

jscomp/flow.ml

@@ -47,10 +47,7 @@ and p_type_decl s type_decl =
 and p_type_expr s type_expr =
   match type_expr.desc with
   | Tvar str ->
-    let str = match str with
-      | Some x -> x
-      | None -> "-" in
-    p_any ("Tvar " ^ str)
+    p_any ("Tvar " ^ (string_of_int type_expr.id))
   | Tarrow (label, left, right, c) -> p_arrow s (label, left, right, c)
   | Ttuple tl -> T_tuple (List.map (p_type_expr s) tl)
   | Tconstr (path, tl, _) ->
@@ -71,7 +68,7 @@ and p_type_expr s type_expr =
         let decl = {decl_name; decl_type} in
         s.types <- decl :: s.types
       end;
-      p_named decl_name
+      p_named ~tl:(List.map (p_type_expr s) tl) decl_name
     end
   | Tobject _ -> p_any "Tobject"
   | Tfield _ -> p_any "Tfield" (* Shouldn't ever happen? *)

jscomp/test_flow/main.js.flow

@@ -18,7 +18,7 @@ declare export var mk_tuple: (p0: M__t, p1: number, p2: void) => [number, number
 
 declare export var mk_rec: (p0: obj_t) => rec_t;
 
-declare export var mk_obj: (p0: /* Tvar - */any) => {id: number, name: string};
+declare export var mk_obj: (p0: /* Tvar 1912 */any) => {id: number, name: string};
 
 declare export var mk_arr: (p0: void) => Array<number>;
 
@@ -27,3 +27,5 @@ declare export var from_util: (p0: Util__t) => void;
 declare export var float_: number;
 
 declare export var tt: tt$0;
+
+declare export var iter: (p0: Array</* Tvar 2242 */any>, p1: Array</* Tvar 2255 */any>, p2: (p0: /* Tvar 2242 */any) => void, p3: (p0: /* Tvar 2255 */any) => void) => void;

jscomp/test_flow/main.ml

@@ -32,3 +32,5 @@ let float_ = 1.0
 
 type tt = int
 let tt: tt = 0
+
+let iter items1 items2 fn1 fn2 = Array.iter fn1 items1; Array.iter fn2 items2