Merge pull request #1921 from BuckleScript/snapshot_changes

snapshot changes

Author: bobzhang

jscomp/all.depend

@@ -456,10 +456,9 @@ core/lam_compile_const.cmx : core/lam_compile_util.cmx core/lam.cmx \
     syntax/ast_arg.cmx core/lam_compile_const.cmi
 core/lam_inner.cmx : core/lam.cmx core/lam_inner.cmi
 core/lam_util.cmx : core/lam_stats.cmx core/lam_print.cmx \
-    core/lam_id_kind.cmx core/lam_analysis.cmx core/lam.cmx \
-    common/js_config.cmx ext/ident_set.cmx ext/ident_map.cmx \
-    ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
-    ext/ext_filename.cmx ext/ext_array.cmx core/lam_util.cmi
+    core/lam_id_kind.cmx core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx \
+    ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
+    ext/ext_array.cmx core/lam_util.cmi
 core/lam_eta_conversion.cmx : ext/literals.cmx core/lam.cmx ext/ext_list.cmx \
     ext/ext_ident.cmx core/lam_eta_conversion.cmi
 core/lam_group.cmx : core/lam_print.cmx core/lam.cmx core/lam_group.cmi
@@ -519,9 +518,7 @@ core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
     common/js_config.cmx core/js_closure.cmx core/j.cmx ext/ident_set.cmx \
     ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx ext/ext_list.cmx \
     ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
-core/js_pass_debug.cmx : core/js_dump.cmx common/js_config.cmx core/j.cmx \
-    ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_filename.cmx \
-    core/js_pass_debug.cmi
+core/js_pass_debug.cmx : core/j.cmx core/js_pass_debug.cmi
 core/js_of_lam_option.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
     core/js_analyzer.cmx core/j.cmx core/js_of_lam_option.cmi
 core/js_output.cmx : core/lam_compile_defs.cmx core/lam_analysis.cmx \
@@ -588,8 +585,7 @@ core/lam_pass_eliminate_ref.cmx : core/lam.cmx ext/ident_set.cmx \
 core/lam_pass_lets_dce.cmx : core/lam_util.cmx \
     core/lam_pass_eliminate_ref.cmx core/lam_pass_count.cmx \
     core/lam_beta_reduce.cmx core/lam_analysis.cmx core/lam.cmx \
-    ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
-    core/lam_pass_lets_dce.cmi
+    ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
 core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_inline_util.cmx core/lam_compile_env.cmx core/lam_closure.cmx \
     core/lam_beta_reduce.cmx core/lam_analysis.cmx core/lam.cmx \
@@ -614,8 +610,8 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
     core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
     common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
-    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    ext/ext_filename.cmx core/lam_compile_group.cmi
+    ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
+    core/lam_compile_group.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
@@ -658,12 +654,12 @@ ounit/oUnitLogger.cmx : ounit/oUnitUtils.cmx ounit/oUnitTypes.cmx
 ounit/oUnitTypes.cmx :
 ounit/oUnitUtils.cmx : ounit/oUnitTypes.cmx
 ounit/oUnitChooser.cmx : ounit/oUnitTypes.cmx
-super_errors/super_misc.cmx : ext/ext_color.cmx super_errors/super_misc.cmi
+super_errors/super_misc.cmx : super_errors/super_misc.cmi
 super_errors/super_warnings.cmx :
-super_errors/super_typecore.cmx : super_errors/super_misc.cmx
-super_errors/super_typetexp.cmx :
 super_errors/super_location.cmx : super_errors/super_warnings.cmx \
     super_errors/super_misc.cmx
+super_errors/super_typecore.cmx : super_errors/super_location.cmx
+super_errors/super_typetexp.cmx : super_errors/super_location.cmx
 super_errors/super_main.cmx : super_errors/super_typetexp.cmx \
     super_errors/super_typecore.cmx super_errors/super_location.cmx
 super_errors/super_misc.cmi :

jscomp/bin/bsdep.ml

@@ -743,6 +743,9 @@ module Color : sig
     | Bold
     | Reset
 
+    | Dim
+
+
   val ansi_of_style_l : style list -> string
   (* ANSI escape sequence for the given style *)
 
@@ -1147,6 +1150,9 @@ module Color = struct
     | Bold
     | Reset
 
+    | Dim
+
+
   let ansi_of_color = function
     | Black -> "0"
     | Red -> "1"
@@ -1163,6 +1169,9 @@ module Color = struct
     | Bold -> "1"
     | Reset -> "0"
 
+    | Dim -> "2"
+
+
   let ansi_of_style_l l =
     let s = match l with
       | [] -> code_of_style Reset
@@ -1193,6 +1202,11 @@ module Color = struct
     | "error" -> (!cur_styles).error
     | "warning" -> (!cur_styles).warning
     | "loc" -> (!cur_styles).loc
+
+    | "info" -> [Bold; FG Yellow]
+    | "dim" -> [Dim]
+    | "filename" -> [FG Cyan]
+
     | _ -> raise Not_found
 
   let color_enabled = ref true
@@ -1999,6 +2013,10 @@ val print_error_prefix: formatter -> unit -> unit
 
 val error: ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
 
+ 
+val pp_ksprintf : ?before:(formatter -> unit) -> (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b
+
+
 val errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
             -> ('a, Format.formatter, unit, error) format4 -> 'a
 

jscomp/bin/bspp.ml

@@ -680,6 +680,9 @@ module Color : sig
     | Bold
     | Reset
 
+    | Dim
+
+
   val ansi_of_style_l : style list -> string
   (* ANSI escape sequence for the given style *)
 
@@ -1084,6 +1087,9 @@ module Color = struct
     | Bold
     | Reset
 
+    | Dim
+
+
   let ansi_of_color = function
     | Black -> "0"
     | Red -> "1"
@@ -1100,6 +1106,9 @@ module Color = struct
     | Bold -> "1"
     | Reset -> "0"
 
+    | Dim -> "2"
+
+
   let ansi_of_style_l l =
     let s = match l with
       | [] -> code_of_style Reset
@@ -1130,6 +1139,11 @@ module Color = struct
     | "error" -> (!cur_styles).error
     | "warning" -> (!cur_styles).warning
     | "loc" -> (!cur_styles).loc
+
+    | "info" -> [Bold; FG Yellow]
+    | "dim" -> [Dim]
+    | "filename" -> [FG Cyan]
+
     | _ -> raise Not_found
 
   let color_enabled = ref true
@@ -1936,6 +1950,10 @@ val print_error_prefix: formatter -> unit -> unit
 
 val error: ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
 
+ 
+val pp_ksprintf : ?before:(formatter -> unit) -> (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b
+
+
 val errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
             -> ('a, Format.formatter, unit, error) format4 -> 'a
 

jscomp/bin/bsppx.ml

@@ -680,6 +680,9 @@ module Color : sig
     | Bold
     | Reset
 
+    | Dim
+
+
   val ansi_of_style_l : style list -> string
   (* ANSI escape sequence for the given style *)
 
@@ -1084,6 +1087,9 @@ module Color = struct
     | Bold
     | Reset
 
+    | Dim
+
+
   let ansi_of_color = function
     | Black -> "0"
     | Red -> "1"
@@ -1100,6 +1106,9 @@ module Color = struct
     | Bold -> "1"
     | Reset -> "0"
 
+    | Dim -> "2"
+
+
   let ansi_of_style_l l =
     let s = match l with
       | [] -> code_of_style Reset
@@ -1130,6 +1139,11 @@ module Color = struct
     | "error" -> (!cur_styles).error
     | "warning" -> (!cur_styles).warning
     | "loc" -> (!cur_styles).loc
+
+    | "info" -> [Bold; FG Yellow]
+    | "dim" -> [Dim]
+    | "filename" -> [FG Cyan]
+
     | _ -> raise Not_found
 
   let color_enabled = ref true
@@ -1936,6 +1950,10 @@ val print_error_prefix: formatter -> unit -> unit
 
 val error: ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
 
+ 
+val pp_ksprintf : ?before:(formatter -> unit) -> (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b
+
+
 val errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
             -> ('a, Format.formatter, unit, error) format4 -> 'a
 

jscomp/bin/whole_compiler.d

@@ -45,7 +45,6 @@ bin/whole_compiler.ml : core/lam_util.ml
 bin/whole_compiler.ml : ext/ext_array.ml
 bin/whole_compiler.ml : ext/ext_bytes.ml
 bin/whole_compiler.ml : ext/ext_char.mli
-bin/whole_compiler.ml : ext/ext_color.ml
 bin/whole_compiler.ml : ext/ext_ident.ml
 bin/whole_compiler.ml : ext/ext_list.mli
 bin/whole_compiler.ml : ext/ext_utf8.mli
@@ -67,7 +66,6 @@ bin/whole_compiler.ml : core/lam_util.mli
 bin/whole_compiler.ml : core/type_util.ml
 bin/whole_compiler.ml : ext/ext_array.mli
 bin/whole_compiler.ml : ext/ext_bytes.mli
-bin/whole_compiler.ml : ext/ext_color.mli
 bin/whole_compiler.ml : ext/ext_format.ml
 bin/whole_compiler.ml : ext/ext_ident.mli
 bin/whole_compiler.ml : ext/ext_option.ml