fix: regression windows path slash

Author: bobzhang

jscomp/bin/.gitignore

@@ -1,4 +0,0 @@
-ppx_metaquot
-bspack.exe
-bsc.exe
-!*.d

jscomp/bin/all_ounit_tests.ml

@@ -6769,7 +6769,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -6986,13 +6986,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -7001,7 +7001,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/bin/bsb.ml

@@ -1030,7 +1030,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -1247,13 +1247,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -1262,7 +1262,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
@@ -6284,7 +6284,7 @@ let (//) = Ext_filename.combine
 *)
 let resolve_bsb_magic_file ~cwd ~desc p =
   let p_len = String.length p in 
-  let no_slash = Ext_filename.no_slash p 0 p_len in  
+  let no_slash = Ext_filename.no_char p '/'  0  p_len in  
   if no_slash then 
     p 
   else if Filename.is_relative p &&

jscomp/bin/bsb_helper.ml

@@ -996,7 +996,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -1213,13 +1213,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -1228,7 +1228,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/bin/bsdep.ml

@@ -26064,7 +26064,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -26281,13 +26281,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -26296,7 +26296,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/bin/bsppx.ml

@@ -7931,7 +7931,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -8148,13 +8148,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -8163,7 +8163,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/bin/config_whole_compiler.mlp

@@ -23,7 +23,7 @@
 (* The main OCaml version string has moved to ../VERSION *)
 let version = "4.02.3+BS"
 
-let standard_library_default = "%%LIBDIR%%"
+let standard_library_default = %%LIBDIR%%
 
 let standard_library =
   try

jscomp/bin/whole_compiler.ml

@@ -21426,7 +21426,7 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -21643,13 +21643,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -21658,7 +21658,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/bsb/bsb_default.ml

@@ -36,7 +36,7 @@ let (//) = Ext_filename.combine
 *)
 let resolve_bsb_magic_file ~cwd ~desc p =
   let p_len = String.length p in 
-  let no_slash = Ext_filename.no_slash p 0 p_len in  
+  let no_slash = Ext_filename.no_char p '/'  0  p_len in  
   if no_slash then 
     p 
   else if Filename.is_relative p &&

jscomp/config.js

@@ -115,8 +115,14 @@ function patch_config(config_map){
         function (_whole, p0) {
             if (p0 === "LIBDIR") {
                 //Escape
-                var origin_path = path.join(jscomp, '..', 'lib', 'ocaml')
-                return JSON.stringify(origin_path).slice(1, -1)
+		if(is_windows){
+		    return 'Filename.concat (Filename.concat (Filename.concat (Filename.dirname Sys.executable_name) "..") "lib") "ocaml"'
+		}
+		else{
+                    var origin_path = path.join(jscomp, '..', 'lib', 'ocaml')
+                    return JSON.stringify(origin_path);
+			// .slice(1, -1)
+		}
             }
             else {
                 return config_map[map[p0]]

jscomp/ext/ext_filename.ml

@@ -209,13 +209,13 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_slash x i len = 
+let rec no_char x ch i  len = 
   i >= len  || 
-  (String.unsafe_get x i <> '/' && no_slash x (i + 1)  len)
+  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
 
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_slash x 0 len then x 
+  if no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -224,7 +224,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_slash x 0 len then x 
+  if no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'

jscomp/ext/ext_filename.mli

@@ -111,6 +111,6 @@ val replace_backward_slash : string -> string
 (*
 [no_slash s i len]
 *)
-val no_slash : string -> int -> int -> bool
+val no_char : string -> char  -> int -> int  -> bool
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 

jscomp/test/ext_filename.js

@@ -268,13 +268,13 @@ var package_dir = Block.__(246, [function () {
                   ));
     }]);
 
-function no_slash(x, _i, len) {
+function no_char(x, ch, _i, len) {
   while(true) {
     var i = _i;
     if (i >= len) {
       return /* true */1;
     }
-    else if (x.charCodeAt(i) !== /* "/" */47) {
+    else if (x.charCodeAt(i) !== ch) {
       _i = i + 1 | 0;
       continue ;
 
@@ -287,7 +287,7 @@ function no_slash(x, _i, len) {
 
 function replace_backward_slash(x) {
   var len = x.length;
-  if (no_slash(x, 0, len)) {
+  if (no_char(x, /* "\\" */92, 0, len)) {
     return x;
   }
   else {
@@ -304,7 +304,7 @@ function replace_backward_slash(x) {
 
 function replace_slash_backward(x) {
   var len = x.length;
-  if (no_slash(x, 0, len)) {
+  if (no_char(x, /* "/" */47, 0, len)) {
     return x;
   }
   else {
@@ -508,7 +508,7 @@ exports.relative_path                = relative_path;
 exports.node_relative_path           = node_relative_path;
 exports.find_package_json_dir        = find_package_json_dir;
 exports.package_dir                  = package_dir;
-exports.no_slash                     = no_slash;
+exports.no_char                      = no_char;
 exports.replace_backward_slash       = replace_backward_slash;
 exports.replace_slash_backward       = replace_slash_backward;
 exports.module_name_of_file          = module_name_of_file;