Merge pull request #630 from bloomberg/fix_gpr_627

bug fix #627

Author: bobzhang

jscomp/js_dump.ml

@@ -261,7 +261,8 @@ let ipp_ident cxt f id un_used =
     ident cxt f (Ext_ident.make_unused ())
   else 
     ident cxt f id  
-let rec formal_parameter_list cxt (f : P.t) l env =
+let rec formal_parameter_list cxt (f : P.t) method_ l env =
+  let offset = if method_ then 1 else 0 in   
   let rec aux i cxt l = 
     match l with
     | []     -> cxt
@@ -275,9 +276,9 @@ let rec formal_parameter_list cxt (f : P.t) l env =
   | [] -> cxt 
   | [i] -> 
     (** necessary, since some js libraries like [mocha]...*)
-    if Js_fun_env.get_unused env 0 then cxt else ident cxt f i 
+    if Js_fun_env.get_unused env offset then cxt else ident cxt f i 
   | _ -> 
-    aux 0 cxt l  
+    aux offset cxt l  
 
 
 (* IdentMap *)
@@ -371,7 +372,7 @@ let rec pp_function method_
       | Some x -> ignore (ident inner_cxt f x));
       if method_ then begin
         let cxt = P.paren_group f 1 (fun _ -> 
-            formal_parameter_list inner_cxt  f (List.tl l) env )
+            formal_parameter_list inner_cxt  f method_ (List.tl l) env )
         in
         P.space f ;
         ignore @@ P.brace_vgroup f 1 (fun _ ->
@@ -399,7 +400,7 @@ let rec pp_function method_
       end
       else begin  
         let cxt = P.paren_group f 1 (fun _ -> 
-            formal_parameter_list inner_cxt  f l env )
+            formal_parameter_list inner_cxt  f method_ l env )
         in
         P.space f ;
         ignore @@ P.brace_vgroup f 1 (fun _ -> statement_list false cxt f b );

jscomp/test/.depend

@@ -262,6 +262,8 @@ gpr_441.cmj :
 gpr_441.cmx :
 gpr_459_test.cmj : mt.cmi
 gpr_459_test.cmx : mt.cmx
+gpr_627_test.cmj : mt.cmi
+gpr_627_test.cmx : mt.cmx
 guide_for_ext.cmj :
 guide_for_ext.cmx :
 hamming_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/lazy.cmi \
@@ -1012,6 +1014,8 @@ gpr_441.cmo :
 gpr_441.cmj :
 gpr_459_test.cmo : mt.cmi
 gpr_459_test.cmj : mt.cmj
+gpr_627_test.cmo : mt.cmi
+gpr_627_test.cmj : mt.cmj
 guide_for_ext.cmo :
 guide_for_ext.cmj :
 hamming_test.cmo : ../stdlib/printf.cmi mt.cmi ../stdlib/lazy.cmi \

jscomp/test/Makefile

@@ -59,7 +59,7 @@ OTHERS := a test_ari test_export2 test_internalOO test_obj_simple_ffi test_scope
 	optional_ffi_test poly_variant_test \
 	bs_rest_test infer_type_test fs_test module_as_function\
 	test_case_set test_mutliple string_bound_get_test inline_string_test\
-	ppx_this_obj_test unsafe_obj_external	
+	ppx_this_obj_test unsafe_obj_external gpr_627_test	
 
 
 SOURCE_LIST := js_dyn $(OTHERS) 

jscomp/test/gpr_627_test.js

@@ -0,0 +1,73 @@
+'use strict';
+
+var Mt    = require("./mt");
+var Block = require("../../lib/js/block");
+
+var suites = [/* [] */0];
+
+var test_id = [0];
+
+function eq(loc, param) {
+  var y = param[1];
+  var x = param[0];
+  test_id[0] = test_id[0] + 1 | 0;
+  suites[0] = /* :: */[
+    /* tuple */[
+      loc + (" id " + test_id[0]),
+      function () {
+        return /* Eq */Block.__(0, [
+                  x,
+                  y
+                ]);
+      }
+    ],
+    suites[0]
+  ];
+  return /* () */0;
+}
+
+var u = {
+  say: function (x, y) {
+    return x + y | 0;
+  }
+};
+
+var v = {
+  hi: function (x, y) {
+    var self = this ;
+    var u = {
+      x: x
+    };
+    return self.say(u.x) + y + x;
+  },
+  say: function (x) {
+    var self = this ;
+    return x * self.x();
+  },
+  x: function () {
+    return 3;
+  }
+};
+
+var p_001 = u.say(1, 2);
+
+var p = /* tuple */[
+  3,
+  p_001
+];
+
+eq('File "gpr_627_test.ml", line 26, characters 5-12', p);
+
+eq('File "gpr_627_test.ml", line 27, characters 5-12', /* tuple */[
+      v.hi(1, 2),
+      6
+    ]);
+
+Mt.from_pair_suites("gpr_627_test.ml", suites[0]);
+
+exports.suites  = suites;
+exports.test_id = test_id;
+exports.eq      = eq;
+exports.u       = u;
+exports.v       = v;
+/* u Not a pure module */

jscomp/test/gpr_627_test.ml

@@ -0,0 +1,31 @@
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc (x, y) = 
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
+
+let u = object
+  method say x y = x + y
+end [@bs]
+
+let v =
+  let x = 3. in
+  object (self)
+    method hi x y =
+      let u = [%bs.obj{ x  }] in      
+      self##say u##x +. y +.x                            
+    method say  = fun x ->  x *. self## x ()
+    method x () = x
+  end [@bs]
+
+
+let () =
+  let p = (3, u##say 1 2) in
+  eq __LOC__ p ;
+  eq __LOC__ (v##hi 1. 2., 6.)
+
+
+let () = Mt.from_pair_suites __FILE__ !suites
+

jscomp/test/ppx_this_obj_test.js

@@ -58,7 +58,7 @@ var v3 = {
   hi: function (x, y) {
     var self = this ;
     var u = {
-      x: 3
+      x: x
     };
     return self.say(u.x) + y + x;
   },
@@ -72,10 +72,10 @@ var v3 = {
 };
 
 var v4 = {
-  hi: function (_, y) {
+  hi: function (x, y) {
     return x + y;
   },
-  say: function () {
+  say: function (x) {
     return x;
   },
   x: function () {

jscomp/test/ppx_this_obj_test.ml

@@ -34,7 +34,7 @@ let v3 =
   let x = 3. in
   object (self)
     method hi x y =
-      let u = [%bs.obj{ x = 3. }] in      
+      let u = [%bs.obj{ x  }] in      
       self##say u##x +. y +.x                            
     method say  = fun x ->  x *. self## x ()
     method x () = x

jscomp/test/test_bs_this.js

@@ -46,7 +46,7 @@ function f(x) {
             });
 }
 
-function u() {
+function u(x) {
   return x;
 }