clean up js_output

Author: bobzhang

jscomp/stdlib/Makefile.shared

@@ -21,7 +21,7 @@ CAMLC=$(CAMLRUN) $(COMPILER)
 
 #COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib \
 #          -safe-string
-BS_COMMON_FLAGS= -bs-no-version-header  -bs-no-builtin-ppx-mli -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-no-warn-unimplemented-external
+BS_COMMON_FLAGS= -bs-no-version-header  -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-no-warn-unimplemented-external
 
 include ../Makefile.shared
 

jscomp/stdlib/pervasives.ml

@@ -425,8 +425,14 @@ let print_string s = output_string stdout s
 let print_bytes s = output_bytes stdout s
 let print_int i = output_string stdout (string_of_int i)
 let print_float f = output_string stdout (string_of_float f)
+
+#if BS then
+external print_endline : string -> unit = "log" 
+[@@bs.val] [@@bs.scope "console"]
+#else    
 let print_endline s =
   output_string stdout s; output_char stdout '\n'; flush stdout
+#end    
 let print_newline () = output_char stdout '\n'; flush stdout
 
 (* Output functions on standard error *)
@@ -436,8 +442,13 @@ let prerr_string s = output_string stderr s
 let prerr_bytes s = output_bytes stderr s
 let prerr_int i = output_string stderr (string_of_int i)
 let prerr_float f = output_string stderr (string_of_float f)
+#if BS then
+external prerr_endline : string -> unit = "error" 
+[@@bs.val] [@@bs.scope "console"]    
+#else    
 let prerr_endline s =
   output_string stderr s; output_char stderr '\n'; flush stderr
+#end    
 let prerr_newline () = output_char stderr '\n'; flush stderr
 
 (* Input functions on standard input *)

jscomp/stdlib/pervasives.mli

@@ -628,7 +628,12 @@ val print_int : int -> unit
 val print_float : float -> unit
 (** Print a floating-point number, in decimal, on standard output. *)
 
+#if BS then
+external print_endline : string -> unit = "log" 
+[@@bs.val] [@@bs.scope "console"]
+#else    
 val print_endline : string -> unit
+#end
 (** Print a string, followed by a newline character, on
    standard output and flush standard output. *)
 
@@ -656,7 +661,12 @@ val prerr_int : int -> unit
 val prerr_float : float -> unit
 (** Print a floating-point number, in decimal, on standard error. *)
 
+#if BS then
+external prerr_endline : string -> unit = "error" 
+[@@bs.val] [@@bs.scope "console"]
+#else    
 val prerr_endline : string -> unit
+#end  
 (** Print a string, followed by a newline character on standard
    error and flush standard error. *)