clean up pp_print_string

Author: bobzhang

jscomp/all.depend

@@ -484,8 +484,8 @@ core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
 core/js_program_loader.cmx : core/lam_module_ident.cmx \
     core/lam_compile_env.cmx core/js_stmt_make.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/ext_sys.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_filename.cmx \
-    core/config_util.cmx depends/bs_exception.cmx core/js_program_loader.cmi
+    ext/ext_string.cmx ext/ext_filename.cmx core/config_util.cmx \
+    depends/bs_exception.cmx core/js_program_loader.cmi
 core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
     core/js_stmt_make.cmx core/js_program_loader.cmx core/js_op_util.cmx \
     core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \

jscomp/bin/whole_compiler.ml

@@ -22621,6 +22621,8 @@ type error =
   | Bs_package_not_found of string                                                        
   | Bs_main_not_exist of string 
   | Bs_invalid_path of string
+  | Missing_ml_dependency of string 
+  | Dependency_script_module_dependent_not  of string
 (*
 TODO: In the futrue, we should refine dependency [bsb] 
 should not rely on such exception, it should have its own exception handling
@@ -22668,12 +22670,21 @@ type error =
   | Bs_package_not_found of string                            
   | Bs_main_not_exist of string 
   | Bs_invalid_path of string
+  | Missing_ml_dependency of string 
+  | Dependency_script_module_dependent_not  of string 
   (** TODO: we need add location handling *)    
 exception Error of error
 
 let error err = raise (Error err)
 
 let report_error ppf = function
+  | Dependency_script_module_dependent_not s
+    -> 
+    Format.fprintf ppf 
+      "%s is compiled in script mode while its dependent is not"
+      s
+  | Missing_ml_dependency s -> 
+    Format.fprintf ppf "Missing dependency %s in search path" s 
   | Cmj_not_found s ->
     Format.fprintf ppf "%s not found, cmj format is generated by BuckleScript" s
   | Js_not_found s -> 
@@ -83071,21 +83082,16 @@ let string_of_module_id ~output_prefix
           Js_config.get_current_package_name_and_path module_system  
         in
         begin match module_system,  dependency_pkg_info, current_pkg_info with
-          | _, NotFound , _ -> 
-            Ext_pervasives.failwithf ~loc:__LOC__ 
-              " @[dependent module is not found while %s not in search path - compiling %s @] "
-              js_file !Location.input_name 
+          | _, NotFound , _ 
+            -> 
+            Bs_exception.error (Missing_ml_dependency js_file)
           | Goog, (Empty | Package_script _), _ 
             -> 
-            Ext_pervasives.failwithf ~loc:__LOC__ 
-              " @[%s was not compiled with goog support  in search path - while compiling %s @] "
-              js_file !Location.input_name 
+            Bs_exception.error (Dependency_script_module_dependent_not js_file)
           | (AmdJS | NodeJS | Es6 | Es6_global | AmdJS_global),
             ( Empty | Package_script _) ,
             Found _  -> 
-            Ext_pervasives.failwithf ~loc:__LOC__
-              "@[dependency %s was compiled in script mode - while compiling %s in package mode @]"
-              js_file !Location.input_name              
+            Bs_exception.error (Dependency_script_module_dependent_not js_file)
           | Goog , Found (package_name, x), _  -> 
             package_name  ^ "." ^  String.uncapitalize id.name
           | (AmdJS | NodeJS| Es6 | Es6_global|AmdJS_global),
@@ -83427,7 +83433,7 @@ let array_conv =
 
 
 (* https://mathiasbynens.be/notes/javascript-escapes *)
-let pp_string f ?(quote='"') (* ?(utf=false)*) s =
+let pp_string f  (* ?(utf=false)*) s =
   let pp_raw_string f (* ?(utf=false)*) s = 
     let l = String.length s in
     for i = 0 to l - 1 do
@@ -83461,20 +83467,14 @@ let pp_string f ?(quote='"') (* ?(utf=false)*) s =
         P.string f "\\x";
         P.string f (Array.unsafe_get array_conv (c lsr 4));
         P.string f (Array.unsafe_get array_conv (c land 0xf))
-      (* | '\'' -> P.string f "\\'" *)
-      (* | '\"' -> P.string f "\\\"" *)
+      | '\"' -> P.string f "\\\"" (* quote*)
       | _ ->
-        begin 
-          (if c = quote  then
-             P.string f "\\");           
           P.string f (Array.unsafe_get array_str1 (Char.code c))
-        end
     done
   in
-  let quote_s = String.make 1 quote in
-  P.string f quote_s;
+  P.string f "\"";
   pp_raw_string f (*~utf*) s ;
-  P.string f quote_s
+  P.string f "\""
 ;;
 
 (** used in printing keys 
@@ -84982,7 +84982,7 @@ let imports  cxt f (modules : (Ident.t * string) list ) =
       P.nspace f (margin - String.length s + 1) ;      
       P.string f L.from;
       P.space f;
-      pp_string f (file ^ ".js") ;
+      pp_string f file ;
       semi f ;
       P.newline f ;
     ) reversed_list;

jscomp/core/js_dump.ml

@@ -194,7 +194,7 @@ let array_conv =
 
 
 (* https://mathiasbynens.be/notes/javascript-escapes *)
-let pp_string f ?(quote='"') (* ?(utf=false)*) s =
+let pp_string f  (* ?(utf=false)*) s =
   let pp_raw_string f (* ?(utf=false)*) s = 
     let l = String.length s in
     for i = 0 to l - 1 do
@@ -228,20 +228,14 @@ let pp_string f ?(quote='"') (* ?(utf=false)*) s =
         P.string f "\\x";
         P.string f (Array.unsafe_get array_conv (c lsr 4));
         P.string f (Array.unsafe_get array_conv (c land 0xf))
-      (* | '\'' -> P.string f "\\'" *)
-      (* | '\"' -> P.string f "\\\"" *)
+      | '\"' -> P.string f "\\\"" (* quote*)
       | _ ->
-        begin 
-          (if c = quote  then
-             P.string f "\\");           
           P.string f (Array.unsafe_get array_str1 (Char.code c))
-        end
     done
   in
-  let quote_s = String.make 1 quote in
-  P.string f quote_s;
+  P.string f "\"";
   pp_raw_string f (*~utf*) s ;
-  P.string f quote_s
+  P.string f "\""
 ;;
 
 (** used in printing keys 
@@ -1749,7 +1743,7 @@ let imports  cxt f (modules : (Ident.t * string) list ) =
       P.nspace f (margin - String.length s + 1) ;      
       P.string f L.from;
       P.space f;
-      pp_string f (file ^ ".js") ;
+      pp_string f file ;
       semi f ;
       P.newline f ;
     ) reversed_list;

jscomp/core/js_program_loader.ml

@@ -97,21 +97,16 @@ let string_of_module_id ~output_prefix
           Js_config.get_current_package_name_and_path module_system  
         in
         begin match module_system,  dependency_pkg_info, current_pkg_info with
-          | _, NotFound , _ -> 
-            Ext_pervasives.failwithf ~loc:__LOC__ 
-              " @[dependent module is not found while %s not in search path - compiling %s @] "
-              js_file !Location.input_name 
+          | _, NotFound , _ 
+            -> 
+            Bs_exception.error (Missing_ml_dependency js_file)
           | Goog, (Empty | Package_script _), _ 
             -> 
-            Ext_pervasives.failwithf ~loc:__LOC__ 
-              " @[%s was not compiled with goog support  in search path - while compiling %s @] "
-              js_file !Location.input_name 
+            Bs_exception.error (Dependency_script_module_dependent_not js_file)
           | (AmdJS | NodeJS | Es6 | Es6_global | AmdJS_global),
             ( Empty | Package_script _) ,
             Found _  -> 
-            Ext_pervasives.failwithf ~loc:__LOC__
-              "@[dependency %s was compiled in script mode - while compiling %s in package mode @]"
-              js_file !Location.input_name              
+            Bs_exception.error (Dependency_script_module_dependent_not js_file)
           | Goog , Found (package_name, x), _  -> 
             package_name  ^ "." ^  String.uncapitalize id.name
           | (AmdJS | NodeJS| Es6 | Es6_global|AmdJS_global),

jscomp/depends/bs_exception.ml

@@ -32,12 +32,21 @@ type error =
   | Bs_package_not_found of string                            
   | Bs_main_not_exist of string 
   | Bs_invalid_path of string
+  | Missing_ml_dependency of string 
+  | Dependency_script_module_dependent_not  of string 
   (** TODO: we need add location handling *)    
 exception Error of error
 
 let error err = raise (Error err)
 
 let report_error ppf = function
+  | Dependency_script_module_dependent_not s
+    -> 
+    Format.fprintf ppf 
+      "%s is compiled in script mode while its dependent is not"
+      s
+  | Missing_ml_dependency s -> 
+    Format.fprintf ppf "Missing dependency %s in search path" s 
   | Cmj_not_found s ->
     Format.fprintf ppf "%s not found, cmj format is generated by BuckleScript" s
   | Js_not_found s -> 

jscomp/depends/bs_exception.mli

@@ -31,6 +31,8 @@ type error =
   | Bs_package_not_found of string                                                        
   | Bs_main_not_exist of string 
   | Bs_invalid_path of string
+  | Missing_ml_dependency of string 
+  | Dependency_script_module_dependent_not  of string
 (*
 TODO: In the futrue, we should refine dependency [bsb] 
 should not rely on such exception, it should have its own exception handling