Merge pull request #3873 from BuckleScript/fix_3865

tentative fix for #3865

Author: bobzhang

jscomp/core/js_dump.ml

@@ -854,7 +854,8 @@ and expression_desc cxt (level:int) f x : cxt  =
        else       
          E.runtime_call Js_runtime_modules.option "some" [e])
   | Caml_block(el,_, _, Blk_module fields) ->        
-      expression_desc cxt (level:int) f (Object (List.combine fields el))
+      expression_desc cxt (level:int) f (Object (
+        (Ext_list.map_combine fields el Ext_ident.convert)))
   | Caml_block( el, mutable_flag, tag, tag_info)
     ->
     (* Note that, if we ignore more than tag [0] we loose some information

jscomp/core/js_exp_make.ml

@@ -163,6 +163,7 @@ let dot ?comment (e0 : t)  (e1 : string) : t =
 
 
 let module_access (e : t) (name : string) (pos : int32) =    
+  let name = Ext_ident.convert name in  
   match e.expression_desc with 
   | Caml_block (l, _, _,_) when no_side_effect e -> 
     (match Ext_list.nth_opt l (Int32.to_int pos) with 

jscomp/ext/ext_list.ml

@@ -68,6 +68,13 @@ let rec has_string l f =
   | x1 :: x2 :: x3 :: x4 ->
     x1 = f || x2 = f || x3 = f || has_string x4 f 
 
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+    ([], []) -> []
+  | (a1::l1, a2::l2) -> 
+    (f a1, a2) :: map_combine l1 l2 f 
+  | (_, _) -> 
+    invalid_arg "Ext_list.map_combine"
 
 let rec map_split_opt 
   (xs : 'a list)  (f : 'a -> 'b option * 'c option) 

jscomp/ext/ext_list.mli

@@ -28,10 +28,18 @@ val map :
   ('a -> 'b) -> 
   'b list 
 
+val map_combine :  
+  'a list -> 
+  'b list -> 
+  ('a -> 'c) -> 
+  ('c * 'b) list 
+  
 val has_string :   
   string list ->
   string -> 
   bool
+
+
 val map_split_opt :  
   'a list ->
   ('a -> 'b option * 'c option) ->

jscomp/test/basic_module_test.js

@@ -9,15 +9,15 @@ var Mt_global = require("./mt_global.js");
 var count = /* record */[/* contents */0];
 
 var M = {
-  Set: Offset.M.Set
+  $$Set: Offset.M.$$Set
 };
 
 function test(set) {
-  count[0] = Curry._1(M.Set.cardinal, set) + count[0] | 0;
+  count[0] = Curry._1(M.$$Set.cardinal, set) + count[0] | 0;
   return /* () */0;
 }
 
-test(Curry._1(Offset.M.Set.singleton, "42"));
+test(Curry._1(Offset.M.$$Set.singleton, "42"));
 
 var suites = /* record */[/* contents : [] */0];
 

jscomp/test/build.ninja

@@ -297,6 +297,9 @@ build test/gpr_3609_test.cmi test/gpr_3609_test.cmj : cc test/gpr_3609_test.ml |
 build test/gpr_3697_test.cmi test/gpr_3697_test.cmj : cc test/gpr_3697_test.ml | $stdlib
 build test/gpr_373_test.cmi test/gpr_373_test.cmj : cc test/gpr_373_test.ml | $stdlib
 build test/gpr_3770_test.cmi test/gpr_3770_test.cmj : cc test/gpr_3770_test.ml | $stdlib
+build test/gpr_3865.cmi test/gpr_3865.cmj : cc test/gpr_3865.re | test/gpr_3865_bar.cmj test/gpr_3865_foo.cmj $stdlib
+build test/gpr_3865_bar.cmi test/gpr_3865_bar.cmj : cc test/gpr_3865_bar.re | $stdlib
+build test/gpr_3865_foo.cmi test/gpr_3865_foo.cmj : cc test/gpr_3865_foo.re | $stdlib
 build test/gpr_405_test.cmj : cc_cmi test/gpr_405_test.ml | test/gpr_405_test.cmi $stdlib
 build test/gpr_405_test.cmi : cc test/gpr_405_test.mli | $stdlib
 build test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.ml | $stdlib

jscomp/test/class4_test.js

@@ -96,7 +96,7 @@ function restricted_point2$prime_init($$class) {
 var restricted_point2$prime = CamlinternalOO.make_class(shared$2, restricted_point2$prime_init);
 
 var Point = {
-  "restricted_point'": restricted_point
+  restricted_point$prime: restricted_point
 };
 
 function abstract_point_001($$class) {

jscomp/test/gpr_3519_jsx_test.js

@@ -2,7 +2,7 @@
 
 
 var React = {
-  null: /* () */0
+  $$null: /* () */0
 };
 
 function make(param, param$1) {

jscomp/test/gpr_3865.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var Gpr_3865_foo = require("./gpr_3865_foo.js");
+
+var B = {
+  $$return: Gpr_3865_foo.$$return
+};
+
+console.log(Gpr_3865_foo.$$return);
+
+console.log(Gpr_3865_foo.$$return);
+
+var F = 0;
+
+exports.F = F;
+exports.B = B;
+/*  Not a pure module */

jscomp/test/gpr_3865.re

@@ -0,0 +1,5 @@
+module F = Gpr_3865_foo;
+module B = Gpr_3865_bar.Make(Gpr_3865_foo);
+
+Js.log(F.return);
+Js.log(B.return);