fix #1559

Author: bobzhang

jscomp/Makefile

@@ -295,6 +295,7 @@ CORE_SRCS= js_runtime_modules \
 	js_dump_property\
 	js_dump_import_export\
 	js_dump \
+	js_name_of_module_id\
 	js_dump_program \
 	js_pass_debug\
 	js_of_lam_option js_output lam_compile_global \

jscomp/all.depend

@@ -345,6 +345,8 @@ core/js_dump_string.cmi : ext/ext_pp.cmi
 core/js_dump_property.cmi : ext/ext_pp.cmi
 core/js_dump_import_export.cmi : ext/ext_pp_scope.cmi ext/ext_pp.cmi
 core/js_dump.cmi : core/j.cmx ext/ext_pp_scope.cmi ext/ext_pp.cmi
+core/js_name_of_module_id.cmi : core/lam_module_ident.cmi \
+    core/js_packages_info.cmi
 core/js_dump_program.cmi : core/js_packages_info.cmi core/j.cmx \
     ext/ext_pp.cmi
 core/js_pass_debug.cmi : core/j.cmx
@@ -538,9 +540,12 @@ core/js_dump.cmx : core/js_stmt_make.cmx core/js_runtime_modules.cmx \
     core/js_dump_lit.cmx core/js_dump_import_export.cmx core/js_closure.cmx \
     core/j.cmx ext/ident_set.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx \
     ext/ext_list.cmx ext/ext_ident.cmx core/js_dump.cmi
+core/js_name_of_module_id.cmx : core/lam_compile_env.cmx \
+    core/js_packages_state.cmx core/js_packages_info.cmx \
+    core/js_name_of_module_id.cmi
 core/js_dump_program.cmx : core/lam_module_ident.cmx \
-    core/lam_compile_env.cmx core/js_packages_state.cmx \
-    core/js_packages_info.cmx core/js_dump_string.cmx core/js_dump_lit.cmx \
+    core/js_packages_info.cmx core/js_name_of_module_id.cmx \
+    core/js_dump_string.cmx core/js_dump_lit.cmx \
     core/js_dump_import_export.cmx core/js_dump.cmx common/js_config.cmx \
     core/j.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx common/bs_version.cmx \
     core/js_dump_program.cmi

jscomp/bin/all_ounit_tests.ml

@@ -11251,10 +11251,7 @@ module Ext_path : sig
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-type t = 
-  | File of string 
-  | Dir of string 
+type t 
 
 
 
@@ -11406,8 +11403,11 @@ let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
 let node_rebase_file ~from ~to_ file = 
+  
   node_concat
-    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    ~dir:(
+      if from = to_ then Literals.node_current
+      else node_relative_path ~from:(Dir from) (Dir to_)) 
     file
 
 

jscomp/bin/bsb.ml

@@ -4741,10 +4741,7 @@ module Ext_path : sig
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-type t = 
-  | File of string 
-  | Dir of string 
+type t 
 
 
 
@@ -4896,8 +4893,11 @@ let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
 let node_rebase_file ~from ~to_ file = 
+  
   node_concat
-    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    ~dir:(
+      if from = to_ then Literals.node_current
+      else node_relative_path ~from:(Dir from) (Dir to_)) 
     file
 
 

jscomp/bin/bsb_helper.ml

@@ -1314,10 +1314,7 @@ module Ext_path : sig
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-type t = 
-  | File of string 
-  | Dir of string 
+type t 
 
 
 
@@ -1469,8 +1466,11 @@ let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
 let node_rebase_file ~from ~to_ file = 
+  
   node_concat
-    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    ~dir:(
+      if from = to_ then Literals.node_current
+      else node_relative_path ~from:(Dir from) (Dir to_)) 
     file
 
 

jscomp/bin/whole_compiler.d

@@ -407,6 +407,7 @@ bin/whole_compiler.ml : ../vendor/ocaml/typing/cmt_format.mli
 bin/whole_compiler.ml : ../vendor/ocaml/typing/includecore.ml
 bin/whole_compiler.ml : ../vendor/ocaml/typing/includemod.mli
 bin/whole_compiler.ml : ../vendor/ocaml/typing/printtyped.mli
+bin/whole_compiler.ml : core/js_name_of_module_id.ml
 bin/whole_compiler.ml : core/js_of_lam_exception.mli
 bin/whole_compiler.ml : core/lam_beta_reduce_util.ml
 bin/whole_compiler.ml : core/ocaml_batch_compile.mli
@@ -421,6 +422,7 @@ bin/whole_compiler.ml : ../vendor/ocaml/typing/includecore.mli
 bin/whole_compiler.ml : ../vendor/ocaml/typing/outcometree.mli
 bin/whole_compiler.ml : ../vendor/ocaml/typing/typedtreeMap.ml
 bin/whole_compiler.ml : core/js_dump_import_export.ml
+bin/whole_compiler.ml : core/js_name_of_module_id.mli
 bin/whole_compiler.ml : core/lam_beta_reduce_util.mli
 bin/whole_compiler.ml : core/lam_compile_primitive.ml
 bin/whole_compiler.ml : core/lam_pass_deep_flatten.ml