Merge pull request rescript-lang#1601 from bloomberg/fix_printer_bug

fix rescript-lang#1600

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -4123,7 +4123,23 @@ external ff :
  OUnit.assert_bool __LOC__
  (not (Ext_string.is_empty should_err.stderr))
 
- end
+ end;
+
+ (* __LOC__ >:: begin fun _ -> *)
+ (* let should_infer = perform_bsc [| "-i"; "-bs-eval"|] {| *)
+ (* let f = fun [@bs] x -> let (a,b) = x in a + b *)
+ (* |} in *)
+ (* let infer_type = bsc_eval (Printf.sprintf {| *)
+
+ (* let f : %s = fun [@bs] x -> let (a,b) = x in a + b *)
+ (* |} should_infer.stdout ) in *)
+ (* begin *)
+ (* Ounit_cmd_util.debug_output should_infer ; *)
+ (* Ounit_cmd_util.debug_output infer_type ; *)
+ (* OUnit.assert_bool __LOC__ *)
+ (* ((Ext_string.is_empty infer_type.stderr)) *)
+ (* end *)
+ (* end *)
  ]
 
 

jscomp/bin/whole_compiler.ml

@@ -41474,16 +41474,19 @@ and print_simple_out_type ppf =
  print_ident id
 
  | Otyp_constr ((Oide_dot (Oide_ident "Js", ("fn" | "meth" as name )) as id) ,
- ([Otyp_variant(_,Ovar_fields [ _, _, tys], _,_); result] as tyl))
+ ([Otyp_variant(_,Ovar_fields [ variant, _, tys], _,_); result] as tyl))
  ->
  (* Otyp_arrow*)
  let make tys result =
  if tys = [] then
  Otyp_arrow ("", Otyp_constr (Oide_ident "unit", []),result)
  else
- match tys with
- | [ Otyp_tuple tys] -> 
- List.fold_right (fun x acc -> Otyp_arrow("",x,acc) ) tys result
+ match tys with
+ | [ Otyp_tuple tys as single] -> 
+ if variant = "Arity_1" then
+ Otyp_arrow ("", single, result)
+ else 
+ List.fold_right (fun x acc -> Otyp_arrow("",x,acc) ) tys result
  | [single] ->
  Otyp_arrow ("", single, result)
  | _ -> 
@@ -41507,12 +41510,14 @@ and print_simple_out_type ppf =
  end
  end
  | Otyp_constr ((Oide_dot (Oide_ident "Js", "meth_callback" ) as id) ,
- ([Otyp_variant(_,Ovar_fields [ _, _, tys], _,_); result] as tyl))
+ ([Otyp_variant(_,Ovar_fields [ variant, _, tys], _,_); result] as tyl))
  ->
  let make tys result =
  match tys with
- | [ Otyp_tuple tys] -> 
- List.fold_right (fun x acc -> Otyp_arrow("",x,acc) ) tys result
+ | [ Otyp_tuple tys as single ] -> 
+ if variant = "Arity_1" then Otyp_arrow ("", single, result)
+ else 
+ List.fold_right (fun x acc -> Otyp_arrow("",x,acc) ) tys result
  | [single] ->
  Otyp_arrow ("", single, result)
  | _ -> 

jscomp/ounit_tests/ounit_cmd_tests.ml

@@ -240,6 +240,22 @@ external ff :
  OUnit.assert_bool __LOC__
  (not (Ext_string.is_empty should_err.stderr))
 
- end
+ end;
+
+ (* __LOC__ >:: begin fun _ -> *)
+ (* let should_infer = perform_bsc [| "-i"; "-bs-eval"|] {| *)
+ (* let f = fun [@bs] x -> let (a,b) = x in a + b *)
+ (* |} in *)
+ (* let infer_type = bsc_eval (Printf.sprintf {| *)
+
+ (* let f : %s = fun [@bs] x -> let (a,b) = x in a + b *)
+ (* |} should_infer.stdout ) in *)
+ (* begin *)
+ (* Ounit_cmd_util.debug_output should_infer ; *)
+ (* Ounit_cmd_util.debug_output infer_type ; *)
+ (* OUnit.assert_bool __LOC__ *)
+ (* ((Ext_string.is_empty infer_type.stderr)) *)
+ (* end *)
+ (* end *)
  ]
 

jscomp/test/.depend

@@ -223,6 +223,7 @@ gpr_1484.cmj :
 gpr_1501_test.cmj : ../stdlib/printexc.cmj mt.cmj
 gpr_1503_test.cmj : mt.cmj ../stdlib/int64.cmj
 gpr_1539_test.cmj :
+gpr_1600_test.cmj : ../runtime/js.cmj ../stdlib/array.cmj
 gpr_405_test.cmj : ../stdlib/hashtbl.cmj gpr_405_test.cmi
 gpr_441.cmj :
 gpr_459_test.cmj : mt.cmj

jscomp/test/Makefile

@@ -154,7 +154,8 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 gpr_1539_test\
 webpack_config\
 bs_qualified\
-mario_game
+mario_game\
+gpr_1600_test
 
 
 # bs_uncurry_test

jscomp/test/gpr_1600_test.js

@@ -0,0 +1,38 @@
+'use strict';
+
+
+var obj = {
+ hi: function (x) {
+ console.log(x);
+ return /* () */0;
+ }
+};
+
+var eventObj = {
+ events: /* array */[],
+ empty: function () {
+ return /* () */0;
+ },
+ push: function (a) {
+ var self = this ;
+ self.events[0] = a;
+ return /* () */0;
+ },
+ needRebuild: function () {
+ var self = this ;
+ return +(self.events.length !== 0);
+ },
+ currentEvents: function () {
+ var self = this ;
+ return self.events;
+ }
+};
+
+function f() {
+ return eventObj;
+}
+
+exports.obj = obj;
+exports.eventObj = eventObj;
+exports.f = f;
+/* obj Not a pure module */

jscomp/test/gpr_1600_test.ml

@@ -0,0 +1,33 @@
+
+
+
+let f : (int * int -> int [@bs]) = fun [@bs] x -> let a,b = x in a + b
+
+
+let obj : < hi : (int * int -> unit [@bs.meth]) > Js.t = object
+ method hi (x : int * int) = Js.log x
+end [@bs]
+(** expect *)
+
+class type _a = object
+ method empty : unit -> unit
+ method currentEvents : unit -> (string * string) array
+ method push : string * string -> unit 
+ method needRebuild : unit -> bool 
+end [@bs]
+
+type a = _a Js.t 
+
+let eventObj : < currentEvents : (unit -> (string * string) array [@bs.meth]);
+ empty : (unit -> unit [@bs.meth]);
+ needRebuild : (unit -> bool [@bs.meth]);
+ push : (string * string -> unit [@bs.meth]) >
+ Js.t = object (self)
+ val events : (string * string) array = [||]
+ method empty () = ()
+ method push a = Array.unsafe_set self##events 0 a 
+ method needRebuild () = Array.length self##events <> 0
+ method currentEvents () = self##events
+end [@bs]
+ 
+let f () = (eventObj : a)