Merge pull request #76 from bloomberg/fix_browser_reload

bobzhang · bobzhang · commit 11cff6a522bf · 2016-02-04T21:24:12.000-05:00
Fix browser reload
diff --git a/jscomp/js_dump.ml b/jscomp/js_dump.ml
@@ -1420,6 +1420,7 @@ let pp_program (program : J.program) (f : Ext_pp.t) =
        begin match Sys.getenv "OCAML_AMD_MODULE" with 
          | exception Not_found -> 
            ignore (node_program f program)
+           (* amd_program f program *)
          | _ -> amd_program f program
        end ) ;
     P.newline f ;
diff --git a/jscomp/js_generate_require.ml b/jscomp/js_generate_require.ml
@@ -1,10 +1,10 @@
 
 let std_files = 
   String_set.elements Js_config.stdlib_set
-  |> List.map (fun x -> "./stdlib/" ^ x ) 
+  |> List.map (fun x -> "./stdlib/" ^ Filename.chop_extension x ) 
 let runtime_files = 
   String_set.elements Js_config.runtime_set 
-  |> List.map (fun x -> "./runtime/" ^ x) 
+  |> List.map (fun x -> "./runtime/" ^ Filename.chop_extension x) 
 
 let () = 
   Ext_pervasives.with_file_as_chan "./pre_load.js" (fun chan -> 
diff --git a/jscomp/js_program_loader.ml b/jscomp/js_program_loader.ml
@@ -39,9 +39,9 @@ let string_of_module_id (x : module_id) : string =
         ->  
         let target = String.uncapitalize file in
         if String_set.mem target Js_config.runtime_set   then
-          "./runtime/" ^ target
+          "./runtime/" ^ Filename.chop_extension target
         else
-          "./stdlib/" ^ target 
+          "./stdlib/" ^ Filename.chop_extension target 
       | NodeJS -> 
         if Ext_string.starts_with id.name "Caml_" then 
           let path = 
diff --git a/jscomp/lam_dispatch_primitive.ml b/jscomp/lam_dispatch_primitive.ml
@@ -470,7 +470,7 @@ let query (prim : Lam_compile_env.primitive_description)
     | "caml_array_blit"
     | "caml_make_vect" -> 
       E.runtime_call Js_helper.array prim.prim_name args 
-
+    | "caml_ml_flush"
     | "caml_ml_out_channels_list"
     | "caml_ml_open_descriptor_in" 
     | "caml_ml_open_descriptor_out"
@@ -576,7 +576,7 @@ let query (prim : Lam_compile_env.primitive_description)
     | "caml_sys_close"
     | "caml_int64_of_string"
     | "caml_sys_open"
-    | "caml_ml_flush"
+
     | "caml_ml_input"
     | "caml_ml_input_scan_line"
     | "caml_ml_input_int"
diff --git a/jscomp/runtime/caml_io.js b/jscomp/runtime/caml_io.js
@@ -280,6 +280,7 @@ function caml_ml_flush(oc) {
     oc.buffer = "";
     return 0;
 }
+exports.caml_ml_flush = caml_ml_flush;
 function caml_ml_output(oc, buffer, offset, len) {
     if (!oc.opened)
         caml_exceptions_1.caml_raise_sys_error("Cannot output to a closed channel");
diff --git a/jscomp/runtime/caml_io.ts b/jscomp/runtime/caml_io.ts
@@ -389,5 +389,6 @@ export {
     caml_ml_output_char,
     caml_ml_output,
     caml_ml_input_char,
-    caml_ml_out_channels_list
+    caml_ml_out_channels_list,
+    caml_ml_flush
 }
diff --git a/jscomp/stdlib/pervasives.js b/jscomp/stdlib/pervasives.js
@@ -223,7 +223,7 @@ function flush_all() {
     var param = _param;
     if (param) {
       try {
-        Caml_primitive.caml_ml_flush(param[1]);
+        Caml_io.caml_ml_flush(param[1]);
       }
       catch (exn){
         
@@ -275,13 +275,13 @@ function output_value(chan, v) {
 }
 
 function close_out(oc) {
-  Caml_primitive.caml_ml_flush(oc);
+  Caml_io.caml_ml_flush(oc);
   return Caml_primitive.caml_ml_close_channel(oc);
 }
 
 function close_out_noerr(oc) {
   try {
-    Caml_primitive.caml_ml_flush(oc);
+    Caml_io.caml_ml_flush(oc);
   }
   catch (exn){
     
@@ -468,7 +468,7 @@ var print_endline = console.log;
 
 function print_newline() {
   Caml_io.caml_ml_output_char(stdout, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stdout);
+  return Caml_io.caml_ml_flush(stdout);
 }
 
 function prerr_char(c) {
@@ -495,20 +495,20 @@ var prerr_endline = console.error;
 
 function prerr_newline() {
   Caml_io.caml_ml_output_char(stderr, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stderr);
+  return Caml_io.caml_ml_flush(stderr);
 }
 
 function read_line() {
-  Caml_primitive.caml_ml_flush(stdout);
+  Caml_io.caml_ml_flush(stdout);
   return input_line(stdin);
 }
 
 function read_int() {
-  return Caml_format.caml_int_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));
+  return Caml_format.caml_int_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));
 }
 
 function read_float() {
-  return Caml_format.caml_float_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));
+  return Caml_format.caml_float_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));
 }
 
 function string_of_format(param) {
@@ -547,7 +547,7 @@ function exit(retcode) {
 }
 
 function flush(prim) {
-  return Caml_primitive.caml_ml_flush(prim);
+  return Caml_io.caml_ml_flush(prim);
 }
 
 function output_char(prim, prim$1) {
diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js
@@ -229,7 +229,7 @@ function flush_all() {
     var param = _param;
     if (param) {
       try {
-        Caml_primitive.caml_ml_flush(param[1]);
+        Caml_io.caml_ml_flush(param[1]);
       }
       catch (exn){
         
@@ -281,13 +281,13 @@ function output_value(chan, v) {
 }
 
 function close_out(oc) {
-  Caml_primitive.caml_ml_flush(oc);
+  Caml_io.caml_ml_flush(oc);
   return Caml_primitive.caml_ml_close_channel(oc);
 }
 
 function close_out_noerr(oc) {
   try {
-    Caml_primitive.caml_ml_flush(oc);
+    Caml_io.caml_ml_flush(oc);
   }
   catch (exn){
     
@@ -472,12 +472,12 @@ function print_float(f) {
 function print_endline(s) {
   output_string(stdout, s);
   Caml_io.caml_ml_output_char(stdout, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stdout);
+  return Caml_io.caml_ml_flush(stdout);
 }
 
 function print_newline() {
   Caml_io.caml_ml_output_char(stdout, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stdout);
+  return Caml_io.caml_ml_flush(stdout);
 }
 
 function prerr_char(c) {
@@ -503,25 +503,25 @@ function prerr_float(f) {
 function prerr_endline(s) {
   output_string(stderr, s);
   Caml_io.caml_ml_output_char(stderr, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stderr);
+  return Caml_io.caml_ml_flush(stderr);
 }
 
 function prerr_newline() {
   Caml_io.caml_ml_output_char(stderr, /* "\n" */10);
-  return Caml_primitive.caml_ml_flush(stderr);
+  return Caml_io.caml_ml_flush(stderr);
 }
 
 function read_line() {
-  Caml_primitive.caml_ml_flush(stdout);
+  Caml_io.caml_ml_flush(stdout);
   return input_line(stdin);
 }
 
 function read_int() {
-  return Caml_format.caml_int_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));
+  return Caml_format.caml_int_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));
 }
 
 function read_float() {
-  return Caml_format.caml_float_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));
+  return Caml_format.caml_float_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));
 }
 
 var LargeFile = [0];

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ function caml_ml_flush(oc) {`
`280`	`280`	`oc.buffer = "";`
`281`	`281`	`return 0;`
`282`	`282`	`}`
	`283`	`+exports.caml_ml_flush = caml_ml_flush;`
`283`	`284`	`function caml_ml_output(oc, buffer, offset, len) {`
`284`	`285`	`if (!oc.opened)`
`285`	`286`	`caml_exceptions_1.caml_raise_sys_error("Cannot output to a closed channel");`
Original file line number	Diff line number	Diff line change
`@@ -389,5 +389,6 @@ export {`
`389`	`389`	`caml_ml_output_char,`
`390`	`390`	`caml_ml_output,`
`391`	`391`	`caml_ml_input_char,`
`392`		`- caml_ml_out_channels_list`
	`392`	`+ caml_ml_out_channels_list,`
	`393`	`+ caml_ml_flush`
`393`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ function flush_all() {`
`223`	`223`	`var param = _param;`
`224`	`224`	`if (param) {`
`225`	`225`	`try {`
`226`		`- Caml_primitive.caml_ml_flush(param[1]);`
	`226`	`+ Caml_io.caml_ml_flush(param[1]);`
`227`	`227`	`}`
`228`	`228`	`catch (exn){`
`229`	`229`
`@@ -275,13 +275,13 @@ function output_value(chan, v) {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`function close_out(oc) {`
`278`		`- Caml_primitive.caml_ml_flush(oc);`
	`278`	`+ Caml_io.caml_ml_flush(oc);`
`279`	`279`	`return Caml_primitive.caml_ml_close_channel(oc);`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`function close_out_noerr(oc) {`
`283`	`283`	`try {`
`284`		`- Caml_primitive.caml_ml_flush(oc);`
	`284`	`+ Caml_io.caml_ml_flush(oc);`
`285`	`285`	`}`
`286`	`286`	`catch (exn){`
`287`	`287`
`@@ -468,7 +468,7 @@ var print_endline = console.log;`
`468`	`468`
`469`	`469`	`function print_newline() {`
`470`	`470`	`Caml_io.caml_ml_output_char(stdout, /* "\n" */10);`
`471`		`- return Caml_primitive.caml_ml_flush(stdout);`
	`471`	`+ return Caml_io.caml_ml_flush(stdout);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`function prerr_char(c) {`
`@@ -495,20 +495,20 @@ var prerr_endline = console.error;`
`495`	`495`
`496`	`496`	`function prerr_newline() {`
`497`	`497`	`Caml_io.caml_ml_output_char(stderr, /* "\n" */10);`
`498`		`- return Caml_primitive.caml_ml_flush(stderr);`
	`498`	`+ return Caml_io.caml_ml_flush(stderr);`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`function read_line() {`
`502`		`- Caml_primitive.caml_ml_flush(stdout);`
	`502`	`+ Caml_io.caml_ml_flush(stdout);`
`503`	`503`	`return input_line(stdin);`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`function read_int() {`
`507`		`- return Caml_format.caml_int_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));`
	`507`	`+ return Caml_format.caml_int_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`function read_float() {`
`511`		`- return Caml_format.caml_float_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));`
	`511`	`+ return Caml_format.caml_float_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`function string_of_format(param) {`
`@@ -547,7 +547,7 @@ function exit(retcode) {`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`function flush(prim) {`
`550`		`- return Caml_primitive.caml_ml_flush(prim);`
	`550`	`+ return Caml_io.caml_ml_flush(prim);`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`function output_char(prim, prim$1) {`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ function flush_all() {`
`229`	`229`	`var param = _param;`
`230`	`230`	`if (param) {`
`231`	`231`	`try {`
`232`		`- Caml_primitive.caml_ml_flush(param[1]);`
	`232`	`+ Caml_io.caml_ml_flush(param[1]);`
`233`	`233`	`}`
`234`	`234`	`catch (exn){`
`235`	`235`
`@@ -281,13 +281,13 @@ function output_value(chan, v) {`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`function close_out(oc) {`
`284`		`- Caml_primitive.caml_ml_flush(oc);`
	`284`	`+ Caml_io.caml_ml_flush(oc);`
`285`	`285`	`return Caml_primitive.caml_ml_close_channel(oc);`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`function close_out_noerr(oc) {`
`289`	`289`	`try {`
`290`		`- Caml_primitive.caml_ml_flush(oc);`
	`290`	`+ Caml_io.caml_ml_flush(oc);`
`291`	`291`	`}`
`292`	`292`	`catch (exn){`
`293`	`293`
`@@ -472,12 +472,12 @@ function print_float(f) {`
`472`	`472`	`function print_endline(s) {`
`473`	`473`	`output_string(stdout, s);`
`474`	`474`	`Caml_io.caml_ml_output_char(stdout, /* "\n" */10);`
`475`		`- return Caml_primitive.caml_ml_flush(stdout);`
	`475`	`+ return Caml_io.caml_ml_flush(stdout);`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`function print_newline() {`
`479`	`479`	`Caml_io.caml_ml_output_char(stdout, /* "\n" */10);`
`480`		`- return Caml_primitive.caml_ml_flush(stdout);`
	`480`	`+ return Caml_io.caml_ml_flush(stdout);`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`function prerr_char(c) {`
`@@ -503,25 +503,25 @@ function prerr_float(f) {`
`503`	`503`	`function prerr_endline(s) {`
`504`	`504`	`output_string(stderr, s);`
`505`	`505`	`Caml_io.caml_ml_output_char(stderr, /* "\n" */10);`
`506`		`- return Caml_primitive.caml_ml_flush(stderr);`
	`506`	`+ return Caml_io.caml_ml_flush(stderr);`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`function prerr_newline() {`
`510`	`510`	`Caml_io.caml_ml_output_char(stderr, /* "\n" */10);`
`511`		`- return Caml_primitive.caml_ml_flush(stderr);`
	`511`	`+ return Caml_io.caml_ml_flush(stderr);`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`function read_line() {`
`515`		`- Caml_primitive.caml_ml_flush(stdout);`
	`515`	`+ Caml_io.caml_ml_flush(stdout);`
`516`	`516`	`return input_line(stdin);`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`function read_int() {`
`520`		`- return Caml_format.caml_int_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));`
	`520`	`+ return Caml_format.caml_int_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`function read_float() {`
`524`		`- return Caml_format.caml_float_of_string((Caml_primitive.caml_ml_flush(stdout), input_line(stdin)));`
	`524`	`+ return Caml_format.caml_float_of_string((Caml_io.caml_ml_flush(stdout), input_line(stdin)));`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`var LargeFile = [0];`